From 571473bd8747884d18bfe2a40b3b63327d8ecbd0 Mon Sep 17 00:00:00 2001
From: Russell Bryant <rbryant@redhat.com>
Date: Mon, 2 Dec 2013 11:22:41 -0500
Subject: [PATCH] Add .mailmap file

Add a .mailmap file for git to use for cases where the same person has
commits with more than one name or email address.

Change-Id: I14c787ecc196b064a5d2c714d26ea1b854bb933e
---
 .mailmap | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..8b0ed8f24
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,9 @@
+# Format is:
+# <preferred e-mail> <other e-mail 1>
+# <preferred e-mail> <other e-mail 2>
+<douglas.mendizabal@rackspace.com> <dougmendizabal@gmail.com>
+<jarret.raim@rackspace.com> <jarito@gmail.com>
+John Wood <john.wood@rackspace.com> <jfwood@ubuntu.(none)>
+Malini K. Bhandaru <malini.k.bhandaru@intel.com> <malini@ubuntu.(none)>
+Malini K. Bhandaru <malini.k.bhandaru@intel.com> Malini Bhandaru <malini.k.bhandaru@intel.com>
+