cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [1/17] git commit: Merge branch 'master' into vpc
Date Wed, 11 Jul 2012 20:18:07 GMT
Updated Branches:
  refs/heads/vpc 7cb4ab5e6 -> ef8208af0


Merge branch 'master' into vpc


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

Branch: refs/heads/vpc
Commit: ef8208af00c3f4bb8f0792b50af420b7733c1ed7
Parents: 7cb4ab5 ab2669b
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Wed Jul 11 13:18:51 2012 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Wed Jul 11 13:18:51 2012 -0700

----------------------------------------------------------------------
 build/build-devcloud.xml                       |   24 +++---
 server/src/com/cloud/vm/UserVmManagerImpl.java |    5 +-
 tools/devcloud/devcloudsetup.sh                |   19 ++++-
 ui/css/cloudstack3.css                         |   61 ++++++++++++++
 ui/index.jsp                                   |    2 +-
 ui/scripts/network.js                          |   82 ++++++++++++++++++-
 ui/scripts/ui-custom/enableStaticNAT.js        |   34 ++++++++
 ui/scripts/ui/widgets/multiEdit.js             |   27 ++++++-
 8 files changed, 232 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ef8208af/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------


Mime
View raw message