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 8c633f27622b09aca4f49062baeca83523071c06
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 6e7260ed246f955429a3a1c0e93576c9d4864fca
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 4506fa93f00c18800d31a2d00e5698c80622936b
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 7bce4badbe29724e575883ef9485312603dfc46c
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 3d859c90effd71aab99f97ae65e2cad30960ca4b
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 b7d58e6451a2f2234f05d6899a62a0e5da7e87e2
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 82a8d2dde76289dcd7a17ebda6fec8af07f8df73
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.
---
