Merge "LBaaS: when returning VIP include session_persistence even if None"

author Jenkins <jenkins@review.openstack.org>

Thu, 21 Nov 2013 11:25:40 +0000 (11:25 +0000)

committer Gerrit Code Review <review@openstack.org>

Thu, 21 Nov 2013 11:25:40 +0000 (11:25 +0000)
author Jenkins <jenkins@review.openstack.org>
Thu, 21 Nov 2013 11:25:40 +0000 (11:25 +0000)
committer Gerrit Code Review <review@openstack.org>
Thu, 21 Nov 2013 11:25:40 +0000 (11:25 +0000)
diff --cc neutron/db/loadbalancer/loadbalancer_db.py
Simple merge
diff --cc neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Thu, 21 Nov 2013 11:25:40 +0000 (11:25 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Thu, 21 Nov 2013 11:25:40 +0000 (11:25 +0000)
		1	2
neutron/db/loadbalancer/loadbalancer_db.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py	patch \|	diff1 \|	diff2 \|	blob \| history