Merge "Update default value for agent_required attribute"

author Jenkins <jenkins@review.openstack.org>

Thu, 13 Nov 2014 16:02:06 +0000 (16:02 +0000)

committer Gerrit Code Review <review@openstack.org>

Thu, 13 Nov 2014 16:02:06 +0000 (16:02 +0000)
author Jenkins <jenkins@review.openstack.org>
Thu, 13 Nov 2014 16:02:06 +0000 (16:02 +0000)
committer Gerrit Code Review <review@openstack.org>
Thu, 13 Nov 2014 16:02:06 +0000 (16:02 +0000)
diff --cc etc/neutron/plugins/ml2/ml2_conf_sriov.ini
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Thu, 13 Nov 2014 16:02:06 +0000 (16:02 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Thu, 13 Nov 2014 16:02:06 +0000 (16:02 +0000)