Min Chen 348d3ae448 Conflicts: ... api/src/org/apache/cloudstack/api/response/AccountResponse.java Signed-off-by: Min Chen <min.chen@citrix.com>		2012-12-17 15:41:56 -08:00
..
src/com/cloud	Conflicts:	2012-12-17 15:41:56 -08:00
test/com/cloud/agent/transport	Move vmware specific tests from core to vmware-base	2012-10-01 15:03:15 -07:00
pom.xml	Revert "core: Comment testSourceDirectory in pom.xml to fix build"	2012-10-11 17:12:20 +05:30