incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [18/18] git commit: Merge branch 'master' into ui-plugins
Date Fri, 04 Jan 2013 22:47:38 GMT
Updated Branches:
  refs/heads/ui-plugins d1166e6b8 -> a81f8b73e


Merge branch 'master' into ui-plugins


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

Branch: refs/heads/ui-plugins
Commit: a81f8b73e8993b9f6a9c170b5a30d0eeeca0f156
Parents: d1166e6 0055d80
Author: Brian Federle <brian.federle@citrix.com>
Authored: Fri Jan 4 14:47:23 2013 -0800
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Fri Jan 4 14:47:23 2013 -0800

----------------------------------------------------------------------
 awsapi/pom.xml                                     |   27 ++++
 client/pom.xml                                     |    1 +
 client/tomcatconf/commands.properties.in           |    2 +-
 docs/en-US/changing-secondary-storage-servers.xml  |    2 +-
 docs/en-US/changing-secondary-storage-serversp.xml |   36 -----
 docs/en-US/configure-xenserver-dom-memory.xml      |   29 ----
 plugins/hypervisors/vmware/pom.xml                 |    6 +-
 .../cloud/network/element/NiciraNvpElement.java    |    3 +-
 .../network/guru/NiciraNvpGuestNetworkGuru.java    |    7 +-
 .../src/com/cloud/network/nicira/NiciraNvpApi.java |    2 +-
 .../network/element/NiciraNvpElementTest.java      |  119 +++++++++++++++
 .../guru/NiciraNvpGuestNetworkGuruTest.java        |  114 ++++++++++++++
 scripts/vm/network/vnet/modifyvlan.sh              |    2 +
 server/pom.xml                                     |    1 +
 .../com/cloud/network/guru/GuestNetworkGuru.java   |   20 +---
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |    2 +-
 test/integration/component/test_snapshots.py       |    6 +-
 ui/css/cloudstack3.css                             |    1 -
 ui/scripts/accounts.js                             |    1 +
 utils/pom.xml                                      |    1 +
 vmware-base/pom.xml                                |    6 +-
 21 files changed, 287 insertions(+), 101 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a81f8b73/ui/css/cloudstack3.css
----------------------------------------------------------------------


Mime
View raw message