Merge branch 'cloud-agent-with-openvswitch' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into cloud-agent-with-openvswitch

Browse Source

Conflicts:
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java

...

This commit is contained in:

Hugo Trippaers 2013-01-15 09:20:59 +01:00

parent 9f00302ad3 11fd1216ed

commit f09d453efe

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available