From 171b4e8a6ea730f24f92c7c1c88fdd7d962a022d Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Fri, 6 Apr 2012 00:23:29 +0100
Subject: [PATCH] Add some launchpad user email addresses which aren't in git

---
 openstack-config/README            | 1 +
 openstack-config/launchpad-ids.txt | 2 ++
 openstack-config/other-aliases     | 3 +++
 3 files changed, 6 insertions(+)
 create mode 100644 openstack-config/other-aliases

diff --git a/openstack-config/README b/openstack-config/README
index 47aaa99..80333ab 100644
--- a/openstack-config/README
+++ b/openstack-config/README
@@ -35,6 +35,7 @@ To get every email address we know about:
         git log | awk -F '[<>]' '/^Author:/ {print $2}'; \
       done | sort | uniq | grep -v '\((none)\|\.local\)$' > tmp
   $> sed 's/ /\n/' < openstack-config/aliases >> tmp
+  $> sed 's/ /\n/' < openstack-config/other-aliases >> tmp
   $> (sort | uniq | grep -v '\((none)\|\.local\)$') < tmp > emails.txt
 
 To map those to launchpad names:
diff --git a/openstack-config/launchpad-ids.txt b/openstack-config/launchpad-ids.txt
index 5cf4a0d..f69f821 100644
--- a/openstack-config/launchpad-ids.txt
+++ b/openstack-config/launchpad-ids.txt
@@ -22,6 +22,7 @@ andy-southgate andy.southgate@citrix.com
 annegentle anne@openstack.org
 anotherjesse anotherjesse@gmail.com
 apevec apevec@redhat.com
+armando-migliaccio armamig@gmail.com
 asakhnov asakhnov@mirantis.com
 asbjorn-sannes asbjorn.sannes@interhost.no
 asomya asomya@cisco.com
@@ -318,6 +319,7 @@ xtoddx xtoddx@gmail.com
 xyj-asmy xyj.asmy@gmail.com
 yamahata yamahata@valinux.co.jp
 yinliu2 yinliu2@cisco.com
+yogesh-srikrishnan yogesh.srikrishnan@rackspace.com
 yorik-sar yorik.sar@gmail.com
 tamura-yoshiaki yoshi@midokura.jp
 yunmao yunmao@gmail.com
diff --git a/openstack-config/other-aliases b/openstack-config/other-aliases
new file mode 100644
index 0000000..a57db59
--- /dev/null
+++ b/openstack-config/other-aliases
@@ -0,0 +1,3 @@
+# these are aliases of launchpad email to git email
+armamig@gmail.com Armando.Migliaccio@eu.citrix.com
+yogesh.srikrishnan@rackspace.com yogesh.srikrishnan@rackspace.com