Daan Hoogland 78cd64a6c2 CLOUDSTACK-9203 refactorred DeployVM code to be used by UpdateVM as well ... Conflicts: api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java		2016-05-23 22:40:31 +02:00
..
conf	Remove extraneous log directory and add catalina.out log rotation	2016-05-12 08:41:39 +01:00
resources	CLOUDSTACK-9299: Out-of-band Management for CloudStack	2016-05-12 11:05:40 +05:30
scripts	…
src	CLOUDSTACK-9203 refactorred DeployVM code to be used by UpdateVM as well	2016-05-23 22:40:31 +02:00
test	Merge pull request #1523 from nlivens/bug/CLOUDSTACK-9365	2016-05-20 08:34:55 -04:00
pom.xml	maven: Fix jstl version usage	2016-05-11 09:58:27 +05:30