Will Stevens de205c5805 Merge pull request #1297 from DaanHoogland/CLOUDSTACK-9203 ... CLOUDSTACK-9203 Implement security group move on updateVM API call cherry-picked from a exoscale internal fix Conflicts: api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java server/src/com/cloud/vm/UserVmManager.java server/src/com/cloud/vm/UserVmManagerImpl.java * pr/1297: CLOUDSTACK-9203 refactorred DeployVM code to be used by UpdateVM as well CLOUDSTACK-9203 security group update on running instance Signed-off-by: Will Stevens <williamstevens@gmail.com>		2016-05-25 22:59:35 -04: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	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src	Merge pull request #1297 from DaanHoogland/CLOUDSTACK-9203	2016-05-25 22:59:35 -04:00
test	Bug-ID: CLOUDSTACK-8870: Skip external device usage collection if no external devices exist	2016-05-23 15:23:23 +05:30
pom.xml	maven: Fix jstl version usage	2016-05-11 09:58:27 +05:30