Updated Branches: refs/heads/cloud-agent-with-openvswitch 11fd1216e -> f09d453ef
Merge branch 'cloud-agent-with-openvswitch' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into cloud-agent-with-openvswitch Conflicts: plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f09d453e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f09d453e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f09d453e Branch: refs/heads/cloud-agent-with-openvswitch Commit: f09d453efed3f1514c367455bf876cd634f2615b Parents: 9f00302 11fd121 Author: Hugo Trippaers <[email protected]> Authored: Tue Jan 15 09:20:59 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Tue Jan 15 09:20:59 2013 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------
