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 c1040f0fb004c2aa4f39d8d8c195f9334a7b6014
Author: Loic Lambiel <l...@exoscale.ch>
Date: 2015-05-13T14:43:09Z
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 acf33f24a1cbdacef1bd9ce6defd3def703f9433
Author: Daan Hoogland <d...@onecht.net>
Date: 2015-12-30T12:13:38Z
CLOUDSTACK-9203 refactorred DeployVM code to be used by UpdateVM as well
commit bf7ab1f2d6ab1f568772b242a9b3018fb589f85e
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 0aff983cc81895a45295df6671b584d45975453e
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 6ac415d8d4155c591acf1130f8bc445497993a33
Author: Daan Hoogland <daan.hoogl...@gmail.com>
Date: 2016-01-12T10:10:30Z
Merge pull request #3 from
ustcweizhou/CLOUDSTACK-9203-multiple-shared-networks
LGTM, exoscale probably only uses basic zone, so we need this extra.
CLOUDSTACK-9203: fix issue if there are multiple shared networks
commit be86551bc8cece5f619e9e54c04c9ec5f43fd6da
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 4e86f9a6c83d4c94a0f947e9070854da84f5bada
Author: Daan Hoogland <daan.hoogl...@gmail.com>
Date: 2016-01-22T13:16:22Z
Merge pull request #4 from
ustcweizhou/CLOUDSTACK-9203-updatevm-isolated-network
CLOUDSTACK-9203: fix issue when update vm in isolated networks
----
---
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.
---
