Merge "Allow CIDRs with non-zero masked portions"

author Jenkins <jenkins@review.openstack.org>

Thu, 20 Mar 2014 15:46:07 +0000 (15:46 +0000)

committer Gerrit Code Review <review@openstack.org>

Thu, 20 Mar 2014 15:46:07 +0000 (15:46 +0000)
author Jenkins <jenkins@review.openstack.org>
Thu, 20 Mar 2014 15:46:07 +0000 (15:46 +0000)
committer Gerrit Code Review <review@openstack.org>
Thu, 20 Mar 2014 15:46:07 +0000 (15:46 +0000)
diff --cc neutron/api/v2/attributes.py
Simple merge
diff --cc neutron/db/db_base_plugin_v2.py
Simple merge
diff --cc neutron/tests/unit/test_db_plugin.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Thu, 20 Mar 2014 15:46:07 +0000 (15:46 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Thu, 20 Mar 2014 15:46:07 +0000 (15:46 +0000)
		1	2
neutron/api/v2/attributes.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/db/db_base_plugin_v2.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/test_db_plugin.py	patch \|	diff1 \|	diff2 \|	blob \| history