Merge "Fix path for the linuxbridge plugin in folsom initial DB structure"
Merge "Separate packet filter activation from port operation in NEC Plugin"
Merge "Sync oslo gettextutils"
Merge "Fix lbaas_pool_scheduler db migration"
Merge "Imported Translations from Transifex"
Imported Translations from Transifex

Change-Id: I94106b16c4f1bfb6ed7f7cb9d085d55f1ac42da7
Remove unused *AlreadyAttached exceptions

This patch simply removes two exceptions which are not being used.

Closes-Bug: #1210276

Change-Id: I5a3412160f49f6e37f3d9182ce4d4a59b1d7bc09
Ignore pbr*.egg directory

Change-Id: I8a143a20947fef1d1d6a28e53893efe01f49884c
Fixes: Bug #1210306
Merge "Externalize error messages in the API"
Handle nvp default l3 gw service misconfiguration appropriately

Bug 1185885

Avoid returning an unrelated, backend-specific, error message to
the user, and ensure the logical router is removed from the
NVP backend.

Change-Id: I5f7b88480dab80a2138486e612e144b971691cf5
Merge "Remove unused *AlreadyAttached exceptions"
sync some configuration items with codes

Bug #1210173

Change-Id: I3622a45f0907e49391156322553665845978a551
Make SubnetMismatchForPort extend BadRequest rather than Conflict

Nova is trying to do a better job of mapping Neutron exceptions and
change I4c087684ef77988e5f463d7f2f50fc2a04f37db0 is trying to map 409 to
the proper nova exception. In looking at what raises a 409 exception in
Neutron, the SubnetMismatchForPort exception seemed like a candidate for
changing from Conflict (409) to BadRequest (400) to ease that mapping.

Note that the only thing currently using this exception is the L3 router
extension when removing a router interface and the 400 response code is
already listed in the API docs as a possible response code:

http://docs.openstack.org/api/openstack-network/2.0/content/router_remove_interface.html

Also note that it's generally OK to change APIs for a more accurate
response code:

https://wiki.openstack.org/wiki/APIChangeGuidelines#Generally_Considered_OK

Related-Bug: #1209446

Change-Id: I4507e1db69d738ec0f943f1b8b1209f269d5aebf
allow subclasses to modify the parents model hooks

fixes bug 1210387

This change modifies the model hook processing to call the method on the
instance if a hook is registered as a string.  If the hook is a
callable, then callable is called with the hook arguments.

Change-Id: Id14ae89f3f12a500920d248226e0ecba8e35e74c
Merge "Ignore pbr*.egg directory"
Add support for service plugins to the migration framework

Implements blueprint migrations-for-service-plugins
Fixes bug 1209151

Change-Id: If7fc7a4488352e9b65b6973d8ea631e0d9ed8b68
Merge "Fix H102, H103 Apache 2.0 license hacking check error"
Merge "LBaaS: pass the complete healthmonitor object to driver"
Enable conversion for composite attribute items

Bug 1207881

Enable 'dict validators' to convert composite attributes' items
using a 'convert_to' specification in a way similar to first-level
API attributes.
This is needed in order to ensure boolean sub-attributes are
properly handled.

Change-Id: I7f466befaa88112cf7e9b77d854ac292b2af638f
Remove long db transaction for metadata access network

Bug 1204277

Removes nested transactions wrapping plugin ops, and adds
rollback code where required.
Also ensures NeutronPlugin.py does not attempt to remove router
ports twice.

Change-Id: I299d4ed688a70b6dff506c999355661cf783ae26