Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack Re-re-merge for network-refactor merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f1d7d964 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f1d7d964 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f1d7d964 Branch: refs/heads/cloud-agent-with-openvswitch Commit: f1d7d964142b4206191b8fabe61489b34e3ae73b Parents: 2d19f3b e37a823 Author: Chiradeep Vittal <[email protected]> Authored: Thu Jan 17 17:00:24 2013 -0800 Committer: Chiradeep Vittal <[email protected]> Committed: Thu Jan 17 17:00:24 2013 -0800 ---------------------------------------------------------------------- .../debian/config/etc/init.d/cloud-early-config | 2 +- .../debian/config/opt/cloud/bin/vpc_guestnw.sh | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
