Merge "Fix Security-rule's port should not set to 0 when Protocol is TCP/UDP"

author Jenkins <jenkins@review.openstack.org>

Mon, 11 Jan 2016 14:40:54 +0000 (14:40 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 11 Jan 2016 14:40:54 +0000 (14:40 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 11 Jan 2016 14:40:54 +0000 (14:40 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 11 Jan 2016 14:40:54 +0000 (14:40 +0000)
diff --cc neutron/db/securitygroups_db.py
Simple merge
diff --cc neutron/tests/unit/agent/test_securitygroups_rpc.py
Simple merge
diff --cc neutron/tests/unit/extensions/test_securitygroup.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 11 Jan 2016 14:40:54 +0000 (14:40 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 11 Jan 2016 14:40:54 +0000 (14:40 +0000)
		1	2
neutron/db/securitygroups_db.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/agent/test_securitygroups_rpc.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/extensions/test_securitygroup.py	patch \|	diff1 \|	diff2 \|	blob \| history