Merge "Cleaned up some TODO comments for feature/qos that do not apply anymore" into...

author Jenkins <jenkins@review.openstack.org>

Tue, 4 Aug 2015 17:41:22 +0000 (17:41 +0000)

committer Gerrit Code Review <review@openstack.org>

Tue, 4 Aug 2015 17:41:22 +0000 (17:41 +0000)
author Jenkins <jenkins@review.openstack.org>
Tue, 4 Aug 2015 17:41:22 +0000 (17:41 +0000)
committer Gerrit Code Review <review@openstack.org>
Tue, 4 Aug 2015 17:41:22 +0000 (17:41 +0000)
diff --cc neutron/tests/tempest/services/network/json/network_client.py
Simple merge
diff --cc neutron/tests/unit/objects/qos/test_policy.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Tue, 4 Aug 2015 17:41:22 +0000 (17:41 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Tue, 4 Aug 2015 17:41:22 +0000 (17:41 +0000)
		1	2
neutron/tests/tempest/services/network/json/network_client.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/objects/qos/test_policy.py	patch \|	diff1 \|	diff2 \|	blob \| history