summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorMichael Still <mikal@stillhq.com>2012-02-02 14:51:26 +1100
committerMichael Still <mikal@stillhq.com>2012-02-03 18:37:49 +1100
commitf7e5328e136f825343a4988411a1b14a2d2adb98 (patch)
tree56cd70d5d2efdd6e557600e607fcfc5e9ac24238 /.mailmap
parent54d7fdc0c8448765d14b4c3bec23f91e0d0aade7 (diff)
downloadnova-f7e5328e136f825343a4988411a1b14a2d2adb98.tar.gz
Rename inst in _create_image, and pass instance to log msgs.
This renames inst in _create_image to the more consistant name "instance". It also passes the instance through log messages in this method, and removes the instance name from the translatable text for the corresponding log messages. Change-Id: I9a085198d3bea5d073f4297cc57c84dc7fcb0349
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index e5a9098616..ed9c9ab75c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -39,6 +39,7 @@
<masumotok@nttdata.co.jp> <root@openstack2-api>
<matt.dietz@rackspace.com> <matthewdietz@Matthew-Dietzs-MacBook-Pro.local>
<matt.dietz@rackspace.com> <mdietz@openstack>
+<mikal@stillhq.com> <michael.still@canonical.com>
<mordred@inaugust.com> <mordred@hudson>
<naveedm9@gmail.com> <naveed.massjouni@rackspace.com>
<rnirmal@gmail.com> <nirmal.ranganathan@rackspace.com>