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 0d02a778fa89a175a5e1869766202f2308f23fcf
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 aa72dbd814de4ea88f1835a3eb99053082a2e84c
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 f72c8f23b4acccc35bea10455e70dbc30afeee29
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 659f527095fe24f55cbe2a73ecbe6eec31714052
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 64e5792d347540df505dff88087a33d8d62bc0e4
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 acf0213f1cee740ec9ff6c9df902ab5a64adb922
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 976feb31862b5b17f3a3d139bd348ac501cc512b
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
----
---
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.
---
