update mailmap

Reflect new email address that I will be committing under.

Change-Id: I91d763f6020f6aa7a007417c341f952d1efd20c2
Imported Translations from Transifex

Change-Id: I25044718d1a8018994aed3fa5c0b18663dde663d
avoid auto scheduling one dhcp agent twice.

Bug #1183173

Change-Id: Iff7b23faae50e6736b253ca5a2b1280451127200
Merge "update mailmap"
Require oslo.config 1.2.0a2

Fixes bug #1182662

Commit 362bd7f switched us from using 'QUOTA' as a config file section
name to using 'quota'.

This broke backwards compatibility support for 'QUOTA' because the
version of oslo.config that has that compat support had not yet been
released. The gory details are summarized here:

  http://lists.openstack.org/pipermail/openstack-dev/2013-May/009448.html

Change-Id: I7826087147e0713edaaea85a72283998295e2281
Merge "Imported Translations from Transifex"
Fix typo in option group shortcut 'aGENT' in NEC plugin

Also adds a test to check if option group shortcuts work.

Fix bug #1183576

Change-Id: Ib2843f2b2b4e35964fb4bb5280fda8f5c9e2ba0c
Merge "Require oslo.config 1.2.0a2"
Merge "Fix typo in option group shortcut 'aGENT' in NEC plugin"
Merge "avoid auto scheduling one dhcp agent twice."