Merge "Replace subnetpool config options with admin-only API"

author Jenkins <jenkins@review.openstack.org>

Fri, 13 Nov 2015 16:08:38 +0000 (16:08 +0000)

committer Gerrit Code Review <review@openstack.org>

Fri, 13 Nov 2015 16:08:38 +0000 (16:08 +0000)
author Jenkins <jenkins@review.openstack.org>
Fri, 13 Nov 2015 16:08:38 +0000 (16:08 +0000)
committer Gerrit Code Review <review@openstack.org>
Fri, 13 Nov 2015 16:08:38 +0000 (16:08 +0000)
diff --cc etc/neutron.conf
Simple merge
diff --cc neutron/db/db_base_plugin_v2.py
Simple merge
diff --cc neutron/tests/unit/db/test_db_base_plugin_v2.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Fri, 13 Nov 2015 16:08:38 +0000 (16:08 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Fri, 13 Nov 2015 16:08:38 +0000 (16:08 +0000)
		1	2
etc/neutron.conf	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/db/db_base_plugin_v2.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/db/test_db_base_plugin_v2.py	patch \|	diff1 \|	diff2 \|	blob \| history