GitHub user DaanHoogland reopened a pull request: https://github.com/apache/cloudstack/pull/1297
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 You can merge this pull request into a Git repository by running: $ git pull https://github.com/DaanHoogland/cloudstack CLOUDSTACK-9203 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cloudstack/pull/1297.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1297 ---- commit bd585da5e16cfd7e7ed35be7c60a6d1ef96fad3c Author: Daan Hoogland <d...@onecht.net> Date: 2016-04-11T18:22:34Z 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 commit e7ff7ebac2713ace91ccc0f9024cee41a1ee67a9 Author: Daan Hoogland <d...@onecht.net> Date: 2015-12-30T12:13:38Z CLOUDSTACK-9203 refactorred DeployVM code to be used by UpdateVM as well Conflicts: api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java commit 5af102f4695a694c854b5e1efd9a48bd356b9fc1 Author: Loic Lambiel <l...@exoscale.ch> Date: 2015-05-15T13:15:26Z CLOUDSTACK-9203 Prevent security group update while instance is running cherry-picked from a exoscale internal fix Conflicts: api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java commit 07863d99eea4943fbeddd31183810d9bc9edf0ce Author: Wei Zhou <w.z...@tech.leaseweb.com> Date: 2016-01-12T09:56:07Z CLOUDSTACK-9203: fix issue if there are multiple shared networks commit f1eb294a1b803de8729542c6dddd505f029b5c87 Author: Wei Zhou <w.z...@tech.leaseweb.com> Date: 2016-01-22T11:45:13Z CLOUDSTACK-9203: fix issue when update vm in isolated networks commit 94b7bf51b40ff91ba36ecd340d9e26c08f6c1008 Author: Daan Hoogland <d...@onecht.net> Date: 2016-04-11T18:22:34Z 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 commit 72636e2a9c88b1517064410837b5ea77b1c33a5a Author: Daan Hoogland <d...@onecht.net> Date: 2015-12-30T12:13:38Z CLOUDSTACK-9203 refactorred DeployVM code to be used by UpdateVM as well Conflicts: api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java ---- --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---