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 151c1fb2f15813db724752e435dd5817afafe06d
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 b8dbaf7fa439c941af0b3e21110ef33ff310d974
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 f6aaf3323cb0f0b4b1cfe08a58c2e4e391698c77
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 2fa8b22ec6a4f24e08c34f2e0de361c414eecaa4
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 545e8adfe7a8d6e63639d34f8160efa559f4fc83
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 ae558e9f34fb239e35a6e3e078f121b7440f917d
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 3efc7c2ccc211c0a40f6edf7f1ce394e1e8f64dc
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.
---
