Merge "Modified configuration group name to lowercase"
Merge "Fix required enum's name in migration"
Use correct device_manager member in dhcp driver

* The DHCP driver used to use device_delegate, but that has
  changed to device_manager. referencing device_delegate
  caused the cleanup of the dhcp agent namespaces to fail.
  This fixes the issue by using the correct member name,
  device_manager

Change-Id: Iab8ea0549383335ff66f3f13df1953d206eeb28f
Closes-Bug: #1245408
Imported Translations from Transifex

Change-Id: Ib0481b92221f1bb398d7888cb3da68d8a824c5f7
Merge "Creates multiple worker processes for API server"
sync log from oslo

5fef5a8105 allow keeping of existing loggers with fileConfig
fb8075a19d Add amqp=WARN,qpid=WARN to default_log_levels
4654a5d247 Don't override default value for eventlet.wsgi.server logging
41ddd7a975 _get_log_file_path explictly return, when logfile/logdire unset
e12e6b45f8 Make openstack.common.log Python 3 compatible
572cfecb4d Make Messages unicode before hitting logging
3243cdfbe9 python3: handle module moves in log

DocImpact

Change-Id: I63e21a4fbcc633e68a37a549508f971ac0704a6f
Merge "Avoid dhcp agent race condition on subnet and network delete"
Fix query error on dhcp release port for postgresql

This is achieved by disabling eager loading and
hence by avoiding incurring in left outer joins
that cannot be applied because of a nullable
side.

Closes-bug: #1246788

Change-Id: I16bcc738a43609f715c2561413c6387f443bd99c
Merge "sync log from oslo"
Merge "Fix query error on dhcp release port for postgresql"
Fix segment range in N1KV test to remove overlap

Adjusts a segment range in an N1KV unit test so
it doesn't overlap with a segment range in another
test that may be executed simultaneously.

Closes-Bug: #1248377
Change-Id: I84a15a2c772f01d7be7ba91aa86de09b934ef5e9
DHCP agent scheduler support for BigSwitch plugin

Adds support for the Neutron DHCP agent scheduler to the BigSwitch
plugin to support multiple neutron DHCP agents.

Implements: blueprint bsn-dhcp-agent-scheduler
Change-Id: I629ce73c0b97c2409b37afb85639282a116560b7
Merge "Fix segment range in N1KV test to remove overlap"
Fix import log_handler error with publish_errors set

Sync from Olso.
Commit Id is Ibf28ba17f81b5ddeda653f6a3501ecac18ffcd42

This handler sends all error logs as rpc notifications.
Note: when using publish_errors you also need to set the
notification_driver option too.

Closes-bug: #1240349
Change-Id: Ie66b23af8da2e439e0ac2f5677f6a064e3dd3133
Remove database section from plugin.ini

Change https://review.openstack.org/#/c/34515 moved the database
config items to neutron.conf but left some commented out
[database] items. Remove them as well.

Closes-Bug: #1247589
Change-Id: I05913d0c27a683cec30cae31a1978612aa1e1360
Refactor configuring of floating ips on a router

This approach to configuring floating ips is stateless and idempotent.
This allows it to handle corner cases, such as reusing a floating ip
address with a different floating ip id in a way that is easier to
understand.

The concept is to wipe the floating ips clean and rebuild them each
time with the following optimizations.  To avoid bad performance in
manipulating iptables, it is called in the context of a call to
defer_apply_on.  To avoid a disruption in network flow a set
difference is use to determine the set of addresses that no longer
belong on the inteface rather than removing them all blindly.

Change-Id: I98aacbbb52b35688036990961d02e0b273504a77
Fixes: Bug #1209011
remove repeated network type definition in cisco plugin

Fixes-bug: #1248374

Change-Id: I912f9cfc140b9a7ac6369526cc623865cf280313
ExtraRoute: fix _get_extra_routes_by_router_id()

router_id filter wasn't properly applied to the query
so the func returned all extra routes of all routers.

Closes-Bug: #1248219
Change-Id: I77733ee7994c8fccbbc966ccabd83b8fe4def8d5
Merge "Support uncompressed ipv6 address and abbreviated ipv4 address"
Don't shadow str

In the  agent/linux/ovs_lib.py we were shadowing the str keyword with
local variable. Let's not do that.

Change-Id: If800804b1e1f12d782bac524c92f300bd77fdd3c