incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [2/3] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Date Mon, 20 Aug 2012 19:12:22 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack


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

Branch: refs/heads/master
Commit: ec1e3058e917ab00c8ea1fce702ae6a87f3df8f2
Parents: 16437df ad2b8d7
Author: David Nalley <david@gnsa.us>
Authored: Mon Aug 20 15:10:59 2012 -0400
Committer: David Nalley <david@gnsa.us>
Committed: Mon Aug 20 15:10:59 2012 -0400

----------------------------------------------------------------------
 .../WEB-INF/classes/resources/messages.properties  |    1 +
 .../kvm/resource/LibvirtComputingResource.java     |    3 +-
 .../network/lb/ElasticLoadBalancerManagerImpl.java |    8 ---
 server/src/com/cloud/configuration/Config.java     |    1 +
 .../AgentBasedConsoleProxyManager.java             |    8 ---
 .../consoleproxy/ConsoleProxyManagerImpl.java      |    9 ----
 .../router/VirtualNetworkApplianceManagerImpl.java |   13 -----
 server/src/com/cloud/storage/StorageManager.java   |    2 +-
 .../src/com/cloud/storage/StorageManagerImpl.java  |    9 +++-
 .../secondary/SecondaryStorageManagerImpl.java     |    9 ----
 server/src/com/cloud/vm/UserVmManagerImpl.java     |    9 ----
 server/src/com/cloud/vm/VirtualMachineGuru.java    |    3 -
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |   10 +---
 .../test/com/cloud/vm/MockUserVmManagerImpl.java   |    8 ---
 tools/gcc/gcc.sh                                   |   30 +++++++-----
 ui/index.jsp                                       |    1 +
 ui/scripts/sharedFunctions.js                      |    4 ++
 ui/scripts/zoneWizard.js                           |   38 ++++----------
 18 files changed, 47 insertions(+), 119 deletions(-)
----------------------------------------------------------------------



Mime
View raw message