You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/06/12 20:22:41 UTC
[32/50] [abbrv] git commit: updated refs/heads/object_store to 18aeef3
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4f07679d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4f07679d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4f07679d
Branch: refs/heads/object_store
Commit: 4f07679d4966a0e2de97fb0e3a42fb695436e330
Parents: 1bdb626 c2ac409
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Fri Jun 7 02:59:48 2013 -0400
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Fri Jun 7 02:59:48 2013 -0400
----------------------------------------------------------------------
.../debian/config/etc/iptables/iptables-router | 1 +
.../ExternalFirewallDeviceManagerImpl.java | 2 +-
.../ExternalLoadBalancerDeviceManagerImpl.java | 4 +-
.../src/com/cloud/network/NetworkManager.java | 2 +-
.../com/cloud/network/NetworkManagerImpl.java | 20 +--------
.../src/com/cloud/network/NetworkModelImpl.java | 17 +++++---
.../com/cloud/network/NetworkServiceImpl.java | 1 +
.../cloud/network/guru/DirectNetworkGuru.java | 5 +--
.../network/guru/DirectPodBasedNetworkGuru.java | 2 +-
.../VirtualNetworkApplianceManagerImpl.java | 46 +++++++++++---------
.../VpcVirtualNetworkApplianceManagerImpl.java | 6 +--
.../network/vpc/NetworkACLManagerImpl.java | 3 ++
.../network/vpc/NetworkACLServiceImpl.java | 40 +++++++++--------
.../cloud/network/MockNetworkManagerImpl.java | 9 +---
.../com/cloud/vpc/MockNetworkManagerImpl.java | 2 +-
test/integration/smoke/test_volumes.py | 5 +++
ui/scripts/system.js | 16 +++----
ui/scripts/vpc.js | 45 +++++++++++++------
ui/scripts/zoneWizard.js | 5 ++-
19 files changed, 122 insertions(+), 109 deletions(-)
----------------------------------------------------------------------