You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/05/13 20:11:07 UTC
[19/28] git commit: updated refs/heads/master to 35164fd
Merge branch 'master' into ui-cisco-asa1000v-support
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2ac22efc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2ac22efc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2ac22efc
Branch: refs/heads/master
Commit: 2ac22efc5e718d042cff855dadc73092cd655318
Parents: 6dff20e 8f9a42e
Author: Brian Federle <br...@citrix.com>
Authored: Thu May 9 11:33:00 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu May 9 11:33:00 2013 -0700
----------------------------------------------------------------------
api/src/com/cloud/network/vpc/VpcOffering.java | 1 +
.../hypervisor/vmware/resource/VmwareResource.java | 18 +
.../xen/discoverer/XcpServerDiscoverer.java | 7 +-
.../hypervisor/xen/resource/CitrixHelper.java | 87 +++++
.../hypervisor/xen/resource/XcpServerResource.java | 11 +-
.../commands/ListCiscoAsa1000vResourcesCmd.java | 1 +
.../api/commands/ListCiscoVnmcResourcesCmd.java | 15 +-
.../response/CiscoAsa1000vResourceResponse.java | 45 ++-
.../api/response/CiscoVnmcResourceResponse.java | 42 ++-
.../cloud/network/element/NetscalerElement.java | 34 ++-
server/pom.xml | 4 +-
.../src/com/cloud/network/NetworkServiceImpl.java | 6 +-
.../network/guru/ExternalGuestNetworkGuru.java | 40 ++-
.../src/com/cloud/network/rules/RulesManager.java | 3 +
.../com/cloud/network/rules/RulesManagerImpl.java | 38 ++
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 32 ++-
.../com/cloud/resource/ResourceManagerImpl.java | 12 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 10 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 50 ++-
.../com/cloud/network/MockRulesManagerImpl.java | 8 +
server/test/com/cloud/vpc/VpcTest.java | 269 +++++++++++++++
.../networkoffering/CreateNetworkOfferingTest.java | 43 +++
ui/scripts/instances.js | 2 +-
23 files changed, 690 insertions(+), 88 deletions(-)
----------------------------------------------------------------------