You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/06/10 19:27:04 UTC
[10/50] [abbrv] git commit: updated refs/heads/disk_io_throttling to
8b8a0d3
Merge branch 'master' into disk_io_throttling
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/288c5b61
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/288c5b61
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/288c5b61
Branch: refs/heads/disk_io_throttling
Commit: 288c5b61c969aa58e86c8c44556d33164abdc2a6
Parents: 0beffe8 4f07679
Author: Wei Zhou <w....@leaseweb.com>
Authored: Fri Jun 7 09:05:20 2013 +0200
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Fri Jun 7 09:05:20 2013 +0200
----------------------------------------------------------------------
docs/en-US/CloudStack_GSoC_Guide.xml | 1 +
docs/en-US/gsoc-imduffy15.xml | 395 +++++++++++++++++++
docs/en-US/gsoc-tuna.xml | 203 ++++++++++
.../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 +-
22 files changed, 721 insertions(+), 109 deletions(-)
----------------------------------------------------------------------