Merge "Raise max header size to accommodate large tokens"

author Jenkins <jenkins@review.openstack.org>

Sun, 23 Feb 2014 21:26:48 +0000 (21:26 +0000)

committer Gerrit Code Review <review@openstack.org>

Sun, 23 Feb 2014 21:26:48 +0000 (21:26 +0000)
author Jenkins <jenkins@review.openstack.org>
Sun, 23 Feb 2014 21:26:48 +0000 (21:26 +0000)
committer Gerrit Code Review <review@openstack.org>
Sun, 23 Feb 2014 21:26:48 +0000 (21:26 +0000)
diff --cc etc/neutron.conf
Simple merge
diff --cc neutron/wsgi.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Sun, 23 Feb 2014 21:26:48 +0000 (21:26 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Sun, 23 Feb 2014 21:26:48 +0000 (21:26 +0000)
		1	2
etc/neutron.conf	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/wsgi.py	patch \|	diff1 \|	diff2 \|	blob \| history