cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [4/4] git commit: updated refs/heads/master to e02003d
Date Thu, 09 Feb 2017 06:32:54 GMT
Merge pull request #844 from ustcweizhou/assignvm-master

[4.10] CLOUDSTACK-7985: assignVM in Advanced zone with Security GroupsThis commit contains
the following changes:
(1) implementation of assignVM in Advanced zone with Security Groups
(2) keep the default nic on shared network when assignVM
(3) allow migrate vm from/to project;
(4) UI change for selecting account/project/network

* pr/844:
  CLOUDSTACK-7985: assignVM in Advanced zone with Security Groups
  CLOUDSTACK-7985: keep the default nic on shared network when assignVM
  CLOUDSTACK-7985: (1) allow migrate vm from/to project; (2) UI change for selecting account/project/network

Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e02003d6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e02003d6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e02003d6

Branch: refs/heads/master
Commit: e02003d65397290d692796c8924348349b22cf6f
Parents: 2d5054f ab0d04d
Author: Rajani Karuturi <rajani.karuturi@accelerite.com>
Authored: Thu Feb 9 11:54:39 2017 +0530
Committer: Rajani Karuturi <rajani.karuturi@accelerite.com>
Committed: Thu Feb 9 11:54:40 2017 +0530

----------------------------------------------------------------------
 .../api/command/admin/vm/AssignVMCmd.java       |  16 +-
 .../api/response/ProjectResponse.java           |   8 +
 .../cloud/api/query/dao/ProjectJoinDaoImpl.java |   1 +
 server/src/com/cloud/vm/UserVmManagerImpl.java  | 160 ++++++++++--
 server/test/com/cloud/vm/UserVmManagerTest.java |   2 +-
 ui/l10n/en.js                                   |   1 +
 ui/scripts/instances.js                         | 250 ++++++++++++++++++-
 7 files changed, 413 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e02003d6/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/vm/UserVmManagerImpl.java
index de4eaf2,ee7744b..3f21a92
mode 100755,100644..100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e02003d6/ui/l10n/en.js
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e02003d6/ui/scripts/instances.js
----------------------------------------------------------------------


Mime
View raw message