cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seb...@apache.org
Subject [2/2] git commit: updated refs/heads/master to 4f07679
Date Fri, 07 Jun 2013 07:02:12 GMT
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/master
Commit: 4f07679d4966a0e2de97fb0e3a42fb695436e330
Parents: 1bdb626 c2ac409
Author: Sebastien Goasguen <runseb@gmail.com>
Authored: Fri Jun 7 02:59:48 2013 -0400
Committer: Sebastien Goasguen <runseb@gmail.com>
Committed: Fri Jun 7 02:59:48 2013 -0400

----------------------------------------------------------------------
 .../debian/config/etc/iptables/iptables-router     |    1 +
 .../network/ExternalFirewallDeviceManagerImpl.java |    2 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java     |    4 +-
 server/src/com/cloud/network/NetworkManager.java   |    2 +-
 .../src/com/cloud/network/NetworkManagerImpl.java  |   20 +------
 server/src/com/cloud/network/NetworkModelImpl.java |   17 ++++--
 .../src/com/cloud/network/NetworkServiceImpl.java  |    1 +
 .../com/cloud/network/guru/DirectNetworkGuru.java  |    5 +-
 .../network/guru/DirectPodBasedNetworkGuru.java    |    2 +-
 .../router/VirtualNetworkApplianceManagerImpl.java |   46 ++++++++-------
 .../VpcVirtualNetworkApplianceManagerImpl.java     |    6 +-
 .../cloud/network/vpc/NetworkACLManagerImpl.java   |    3 +
 .../cloud/network/vpc/NetworkACLServiceImpl.java   |   40 +++++++------
 .../com/cloud/network/MockNetworkManagerImpl.java  |    9 +---
 .../test/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(-)
----------------------------------------------------------------------



Mime
View raw message