From 2e309e6fc195b577737d9e07a14224b718390fd7 Mon Sep 17 00:00:00 2001
From: Matthew Treinish <treinish@linux.vnet.ibm.com>
Date: Mon, 7 Jan 2013 15:56:08 -0500
Subject: [PATCH] Update gitignore because of oslo setup.py

Change I6ed3a97e35ce73b820f7a436214480051ed6528f started using
setup.py in oslo. This adds support for auto generating the AUTHORS
and ChangeLog files.

This adds these files to gitignore and adds a .mailmap to cleanup the file.

Fixes bug 979958.

Change-Id: If61920c81499c5e579d3c1e7a66f8bf02020dfa9
---
 .gitignore | 4 +++-
 .mailmap   | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 .mailmap

diff --git a/.gitignore b/.gitignore
index b4dca86d65..c1546039b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+AUTHORS
+ChangeLog
 *.pyc
 etc/tempest.conf
 include/swift_objects/swift_small
@@ -6,7 +8,7 @@ include/swift_objects/swift_large
 *.log
 *.swp
 *.swo
-*.egg-info
+*.egg*
 .tox
 .venv
 dist
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..9a22c71360
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,8 @@
+Ravikumar Venkatesan <ravikumar.venkatesan@hp.com> ravikumar-venkatesan <ravikumar.venkatesan@hp.com>
+Ravikumar Venkatesan <ravikumar.venkatesan@hp.com> ravikumar venkatesan <ravikumar.venkatesan@hp.com>
+Rohit Karajgi <rohit.karajgi@nttdata.com> Rohit Karajgi <rohit.karajgi@vertex.co.in>
+Jay Pipes <jaypipes@gmail.com> Jay Pipes <jpipes@librebox.gateway.2wire.net>
+<brian.waldon@rackspace.com> <bcwaldon@gmail.com>
+Daryl Walleck <daryl.walleck@rackspace.com> dwalleck <daryl.walleck@rackspace.com>
+<jeblair@hp.com> <corvus@inaugust.com>
+<jeblair@hp.com> <james.blair@rackspace.com>