Merge "Enable automatic validation of many HACKING rules."

diff --cc quantum/agent/dhcp_agent.py
Simple merge

diff --cc quantum/agent/l3_agent.py
Simple merge

diff --cc quantum/db/db_base_plugin_v2.py
Simple merge

diff --cc quantum/db/extraroute_db.py
Simple merge

diff --cc quantum/db/l3_db.py
Simple merge

diff --cc quantum/plugins/nec/agent/nec_quantum_agent.py
Simple merge

diff --cc quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
Simple merge

diff --cc quantum/plugins/services/agent_loadbalancer/plugin.py
Simple merge

diff --cc quantum/service.py
Simple merge

diff --cc quantum/tests/unit/openvswitch/test_ovs_tunnel.py
Simple merge

diff --cc quantum/tests/unit/test_db_plugin.py
Simple merge

diff --cc quantum/tests/unit/test_l3_plugin.py
Simple merge

diff --cc tox.ini
Simple merge