cloudstack/server
Min Chen 57e67c57d7 Merge branch 'master' into api_limit
Conflicts:
	server/src/com/cloud/api/ApiServer.java

Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-11 15:50:21 -08:00
..
conf License header updates for the server folder. 2012-08-03 09:41:27 -04:00
scripts License header updates for the server folder. 2012-08-03 09:41:27 -04:00
src/com/cloud Merge branch 'master' into api_limit 2013-01-11 15:50:21 -08:00
test AccountManager: Add method to translate account type to role type 2013-01-10 15:55:01 -08:00
pom.xml ApiDispatcher: Get rid of reflections, reuse utils' ReflectUtil 2013-01-08 18:54:29 -08:00