Merge "Add comments to iptables rules to help debugging"

author Jenkins <jenkins@review.openstack.org>

Tue, 7 Oct 2014 23:19:15 +0000 (23:19 +0000)

committer Gerrit Code Review <review@openstack.org>

Tue, 7 Oct 2014 23:19:15 +0000 (23:19 +0000)
author Jenkins <jenkins@review.openstack.org>
Tue, 7 Oct 2014 23:19:15 +0000 (23:19 +0000)
committer Gerrit Code Review <review@openstack.org>
Tue, 7 Oct 2014 23:19:15 +0000 (23:19 +0000)
diff --cc etc/neutron.conf
Simple merge
diff --cc neutron/agent/linux/iptables_firewall.py
Simple merge
diff --cc neutron/tests/unit/test_security_groups_rpc.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Tue, 7 Oct 2014 23:19:15 +0000 (23:19 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Tue, 7 Oct 2014 23:19:15 +0000 (23:19 +0000)
		1	2
etc/neutron.conf	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/agent/linux/iptables_firewall.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/test_security_groups_rpc.py	patch \|	diff1 \|	diff2 \|	blob \| history