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/c2b20a45 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c2b20a45 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c2b20a45 Branch: refs/heads/disk_io_throttling Commit: c2b20a455c9e16838abf1f4fb426e1f12f6b294c Parents: 8220b98 d8a235e Author: Wei Zhou <w.z...@leaseweb.com> Authored: Mon Jun 10 14:15:52 2013 +0200 Committer: Wei Zhou <w.z...@leaseweb.com> Committed: Mon Jun 10 14:15:52 2013 +0200 ---------------------------------------------------------------------- .../consoleproxy/ConsoleProxyManagerImpl.java | 7 + .../component/test_vpc_network_pfrules.py | 487 +++++++++---------- 2 files changed, 244 insertions(+), 250 deletions(-) ----------------------------------------------------------------------
