Merge "Make pep8 job succeed when /etc/neutron/neutron.conf is not installed"

author Jenkins <jenkins@review.openstack.org>

Tue, 9 Jun 2015 20:15:10 +0000 (20:15 +0000)

committer Gerrit Code Review <review@openstack.org>

Tue, 9 Jun 2015 20:15:10 +0000 (20:15 +0000)
author Jenkins <jenkins@review.openstack.org>
Tue, 9 Jun 2015 20:15:10 +0000 (20:15 +0000)
committer Gerrit Code Review <review@openstack.org>
Tue, 9 Jun 2015 20:15:10 +0000 (20:15 +0000)
diff --cc neutron/tests/unit/db/test_db_base_plugin_v2.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Tue, 9 Jun 2015 20:15:10 +0000 (20:15 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Tue, 9 Jun 2015 20:15:10 +0000 (20:15 +0000)