Merge branch 'master' into api_limit
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9ab7960a Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9ab7960a Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9ab7960a Branch: refs/heads/cloud-agent-with-openvswitch Commit: 9ab7960a5d1f8c4691515ec73a2352260275b0c6 Parents: 805261a e37a823 Author: Min Chen <[email protected]> Authored: Thu Jan 17 15:32:00 2013 -0800 Committer: Min Chen <[email protected]> Committed: Thu Jan 17 15:32:00 2013 -0800 ---------------------------------------------------------------------- .../virtualnetwork/VirtualRoutingResource.java | 2 +- .../debian/config/etc/init.d/cloud-early-config | 2 +- .../debian/config/opt/cloud/bin/vpc_guestnw.sh | 1 + python/lib/cloudutils/utilities.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
