summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-28 18:42:23 +0000
committerGerrit Code Review <review@openstack.org>2013-06-28 18:42:23 +0000
commitb03843f3ac8bef30c9b7e0d436d8984d6d4146c2 (patch)
tree0cab9ce1f3b649f7a973a15af5a30bb9592be2ac
parent9f5b334f7a9161843ff30b990eacd06411760d68 (diff)
parent100f95281a731366d6171cfc6b1d6e33052a354f (diff)
downloadpython-swiftclient-b03843f3ac8bef30c9b7e0d436d8984d6d4146c2.tar.gz
Merge "Add *.swp into .gitignore"
-rw-r--r--.gitignore1
-rw-r--r--.mailmap1
2 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 63282cc..94b90ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
AUTHORS
ChangeLog
+*.swp
dist/
.tox
*.egg-info
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..0f2ffac
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Kun Huang <gareth@unitedstack.com> <academicgareth@gmail.com>