Min Chen c1a540c6bb Merge branch 'master' into api_limit ...

Conflicts:
	api/src/org/apache/cloudstack/api/BaseCmd.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/ApiServlet.java

Signed-off-by: Min Chen <min.chen@citrix.com>

2013-01-16 22:48:22 -08:00

..

src

Merge branch 'master' into api_limit

2013-01-16 22:48:22 -08:00

test

Summary: adding resizeVolume api call

2013-01-16 17:43:35 -07:00

pom.xml

Unit test additions (and some minor command class changes to support testing)

2012-11-20 12:21:54 -05:00