Merge "Pass in certain ICMPv6 types by default"

author Jenkins <jenkins@review.openstack.org>

Mon, 2 Dec 2013 07:45:58 +0000 (07:45 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 2 Dec 2013 07:45:58 +0000 (07:45 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 2 Dec 2013 07:45:58 +0000 (07:45 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 2 Dec 2013 07:45:58 +0000 (07:45 +0000)
diff --cc neutron/common/constants.py
Simple merge
diff --cc neutron/tests/unit/test_iptables_firewall.py
Simple merge
diff --cc neutron/tests/unit/test_security_groups_rpc.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 2 Dec 2013 07:45:58 +0000 (07:45 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 2 Dec 2013 07:45:58 +0000 (07:45 +0000)
		1	2
neutron/common/constants.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/test_iptables_firewall.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/test_security_groups_rpc.py	patch \|	diff1 \|	diff2 \|	blob \| history