Merge "Python 3: fix test_attributes"

author Jenkins <jenkins@review.openstack.org>

Thu, 30 Jul 2015 15:30:01 +0000 (15:30 +0000)

committer Gerrit Code Review <review@openstack.org>

Thu, 30 Jul 2015 15:30:01 +0000 (15:30 +0000)
author Jenkins <jenkins@review.openstack.org>
Thu, 30 Jul 2015 15:30:01 +0000 (15:30 +0000)
committer Gerrit Code Review <review@openstack.org>
Thu, 30 Jul 2015 15:30:01 +0000 (15:30 +0000)
diff --cc neutron/api/v2/attributes.py
Simple merge
diff --cc tox.ini
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Thu, 30 Jul 2015 15:30:01 +0000 (15:30 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Thu, 30 Jul 2015 15:30:01 +0000 (15:30 +0000)
		1	2
neutron/api/v2/attributes.py	patch \|	diff1 \|	diff2 \|	blob \| history
tox.ini	patch \|	diff1 \|	diff2 \|	blob \| history