Merge "Remove the useless vim modelines"
Merge "Imported Translations from Transifex"
Merge "Revert "Check NVP router's status before deploying a service""
Don't convert numeric protocol values to int

They are treated as strings everywhere. Converting them to int causes problems
when using postgresql as the database backend because it doesn't automatically
cast them back to integer.

Change-Id: I9f0a5149d24a4c003409728e50376569c97e7325
Closes-bug: 1330490
Merge "Pass serializer to oslo.messaging Notifier"
ofagent: move main module from ryu repository

the recent oslo.messaging transition broke ofagent.
this commit fixes the regression.

historically the main module of ofagent has been maintained
in ryu's repository.  this commit moves it into neutron's
repository and add common_config.init() call which is necesary
for the new rpc code.

Closes-Bug: #1332478
Change-Id: Icf215b20cd84ef44b51439e55b1815d72041ba3f
Updated from global requirements

Change-Id: I7d528afc3051e423e4a405ba1bdc0cb4cc5a9071
Merge multiple constants defining linux interface maximum length

DEVICE_NAME_MAX_LEN constant in neutron.common.constants replaces
and correct multiple constants defining linux interface maximum
length.

Closes-Bug: #1332571
Change-Id: I63f760a21e17dcd57b3685b1e71c913d2722e097
Merge "Add test cases for plugins/ml2/plugin.py"
Merge "changes ovs agent_id init to use hostname instead of mac"
Merge "Improve vxlan type driver initialization performance"
Updated from global requirements

Change-Id: Ie0621bc8226585199a7c36771f23fc125747d3f9
Moved rpc_compat.py code back into rpc.py

Most of this code will probably stay with us for quite some time, so
let's make things easier and consider them as our way of doing RPC.

blueprint oslo-messaging

Change-Id: Iaf353b23f9c54b82d1e02a6bd5a5960cec827c88
Updated neutron.conf to reflect new RPC options

After oslo.messaging port, some option became unavailable to set, some
of them changed description or default values. Make sure we don't leave
anything related to old RPC layer there.

New entries are generated by calling the following from inside
oslo-incubator:

$ python openstack/common/config/generator.py -l oslo.messaging

blueprint oslo-messaging

Change-Id: I1523309cf0cd92a5d5f0b265f49979b3e47c2afa
Merge "Don't convert numeric protocol values to int"
don't ignore rules that are already enforced

H302 / H304 are clean in the neutron source tree, so it seems
like they shouldn't be ignored. This requires no code changes to
enable.

If there is a longer standing reason for these ignores, would be
great to document in tox.ini.

Change-Id: Ib0f483e4f8fbd328815775a2a6f58be448172bd9
Merge "Updated from global requirements"
Pass newly created router to _update_router_gw_info

pass it to _update_router_gw_info as last parameter to save
retrieving it again from the session.

Change-Id: I7fbbd675839c2874578c62dfed390d86e3b4801a
Synced log module and its dependencies from olso-incubator

Old version of 'log' module depended on oslo-incubator RPC layer
implementation. This sync is intended to copy the following fix that
makes log module use oslo.messaging.notify.log_handler if available:

  * 109e325e: Use oslo.messaging to publish log errors

blueprint oslo-messaging

Change-Id: Ieb26df4e9fbb2aa4d319c79be7510006fc8461ab
Merge "Ensure entries in dnsmasq belong to a subnet using DHCP"