Merge remote-tracking branch 'origin/feature/qos' into merge-branch

author Ihar Hrachyshka <ihrachys@redhat.com>

Mon, 13 Jul 2015 10:13:28 +0000 (12:13 +0200)

committer Ihar Hrachyshka <ihrachys@redhat.com>

Mon, 13 Jul 2015 10:13:33 +0000 (12:13 +0200)
author Ihar Hrachyshka <ihrachys@redhat.com>
Mon, 13 Jul 2015 10:13:28 +0000 (12:13 +0200)
committer Ihar Hrachyshka <ihrachys@redhat.com>
Mon, 13 Jul 2015 10:13:33 +0000 (12:13 +0200)
diff --cc neutron/agent/common/ovs_lib.py
Simple merge
diff --cc neutron/db/db_base_plugin_common.py
Simple merge
diff --cc neutron/tests/unit/extensions/test_l3.py
Simple merge
diff --cc neutron/tests/unit/plugins/ml2/test_plugin.py
Simple merge
author	Ihar Hrachyshka <ihrachys@redhat.com>
	Mon, 13 Jul 2015 10:13:28 +0000 (12:13 +0200)
committer	Ihar Hrachyshka <ihrachys@redhat.com>
	Mon, 13 Jul 2015 10:13:33 +0000 (12:13 +0200)
		1	2
neutron/agent/common/ovs_lib.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/db/db_base_plugin_common.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/extensions/test_l3.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/plugins/ml2/test_plugin.py	patch \|	diff1 \|	diff2 \|	blob \| history