summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJohn Dickinson <me@not.mn>2013-03-17 21:51:04 -0700
committerJohn Dickinson <me@not.mn>2013-03-18 20:15:24 -0700
commit9e777bd233c350edd33d09a47b1ec1e5924d3238 (patch)
tree0b23784c52a486472769280fd7715f51b756bb18 /.mailmap
parent157d5c7d499165f3e6306e7b1be929c5cf2bca5a (diff)
downloadswift-9e777bd233c350edd33d09a47b1ec1e5924d3238.tar.gz
AUTHORS/CHANGELOG uploades for the next release1.8.0.rc1
also bumped the dev version to 1.8.0 to reflect the current dev target Change-Id: Ib05cb4f0616c0d297ce5cd7073af766c7a4300d9
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap6
1 files changed, 5 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 727e4772d..681bd646a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,6 +2,7 @@ Greg Holt <gholt@rackspace.com> gholt <gholt@brim.net>
Greg Holt <gholt@rackspace.com> gholt <devnull@brim.net>
Greg Holt <gholt@rackspace.com> gholt <z-github@brim.net>
Greg Holt <gholt@rackspace.com> gholt <z-launchpad@brim.net>
+Greg Holt <gholt@rackspace.com> <gregory.holt+launchpad.net@gmail.com>
Greg Holt <gholt@rackspace.com>
John Dickinson <me@not.mn> <john.dickinson@rackspace.com>
Michael Barton <mike@weirdlooking.com> <michael.barton@rackspace.com>
@@ -17,7 +18,7 @@ Anne Gentle <anne@openstack.org> annegentle
Fujita Tomonori <fujita.tomonori@lab.ntt.co.jp>
Greg Lange <greglange@gmail.com> <glange@rackspace.com>
Greg Lange <greglange@gmail.com> <greglange+launchpad@gmail.com>
-Chmouel Boudjnah <chmouel@chmouel.com> <chmouel@enovance.com>
+Chmouel Boudjnah <chmouel@enovance.com> <chmouel@chmouel.com>
Gaurav B. Gangalwar <gaurav@gluster.com> gaurav@gluster.com <>
Joe Arnold <joe@swiftstack.com> <joe@cloudscaling.com>
Kapil Thangavelu <kapil.foss@gmail.com> kapil.foss@gmail.com <>
@@ -28,6 +29,7 @@ Russ Nelson <russ@crynwr.com> <nelson@nelson-laptop>
Marcelo Martins <btorch@gmail.com> <marcelo.martins@rackspace.com>
Andrew Clay Shafer <acs@parvuscaptus.com> <andrew@cloudscaling.com>
Soren Hansen <soren@linux2go.dk> <soren.hansen@rackspace.com>
+Soren Hansen <soren@linux2go.dk> <sorhanse@cisco.com>
Ye Jia Xu <xyj.asmy@gmail.com> monsterxx03 <xyj.asmy@gmail.com>
Victor Rodionov <victor.rodionov@nexenta.com> <vito.ordaz@gmail.com>
Florian Hines <syn@ronin.io> <florian.hines@gmail.com>
@@ -37,3 +39,5 @@ Li Riqiang <lrqrun@gmail.com> lrqrun <lrqrun@gmail.com>
Cory Wright <cory.wright@rackspace.com> <corywright@gmail.com>
Julien Danjou <julien@danjou.info> <julien.danjou@enovance.com>
David Hadas <davidh@il.ibm.com> <david.hadas@gmail.com>
+Yaguang Wang <yaguang.wang@intel.com> ywang19 <yaguang.wang@intel.com>
+Liu Siqi <meizu647@gmail.com> dk647 <meizu647@gmail.com>