Merge "Python 3: do not index dict_values objects"

author Jenkins <jenkins@review.openstack.org>

Mon, 27 Jul 2015 21:33:36 +0000 (21:33 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 27 Jul 2015 21:33:36 +0000 (21:33 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 27 Jul 2015 21:33:36 +0000 (21:33 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 27 Jul 2015 21:33:36 +0000 (21:33 +0000)
diff --cc neutron/db/quota_db.py
Simple merge
diff --cc tox.ini
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 27 Jul 2015 21:33:36 +0000 (21:33 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 27 Jul 2015 21:33:36 +0000 (21:33 +0000)
		1	2
neutron/db/quota_db.py	patch \|	diff1 \|	diff2 \|	blob \| history
tox.ini	patch \|	diff1 \|	diff2 \|	blob \| history