From: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Date: Thu, 19 Feb 2015 14:08:54 +0000 (+0530)
Subject: mailmap: Billy Olsen affiliation
X-Git-Tag: suse_latest~17^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c1fce65b0268128fcd888ea5d44d190e1b18d63e;p=ceph.git

mailmap: Billy Olsen affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Reviewed-by: Billy Olsen <billy.olsen@canonical.com>
---

diff --git a/.mailmap b/.mailmap
index 785c0ddf57b..37fd90d4745 100644
--- a/.mailmap
+++ b/.mailmap
@@ -23,6 +23,7 @@ Aristoteles Neto <aristoteles.neto@webdrive.co.nz>  <wdneto@users.noreply.github
 Ashish Chandra <ashish.a.chandra@ril.com> <mail.ashishchandra@gmail.com>
 Baptiste Veuillez <baptiste.veuillez--mainard@telecom-bretagne.eu> <baptiste@UbuntuBVM.lan>
 Brian Rak <dn@devicenull.org> devicenull <dn@devicenull.org>
+Billy Olsen <billy.olsen@canonical.com> <billy.olsen@gmail.com>
 Caleb Miles <caleb.miles@inktank.com> caleb miles <caleb.miles@inktank.com>
 Caleb Miles <caleb.miles@inktank.com> caleb miles <caselim@gmail.com>
 Caleb Miles <caleb.miles@inktank.com> Caleb Miles <caselim@gmail.com>
diff --git a/.organizationmap b/.organizationmap
index cc87feb248c..a171c72bbbf 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -29,6 +29,7 @@ ArtiBit <contact@artibit.com> Rutger ter Borg <rutger@terborg.net>
 Bayan <contact@bayan.co.ir> Mohammad Salehe <salehe+dev@gmail.com>
 BCI <contact@bci.co.mz> Marco Garcês <marco.garces@bci.co.mz>
 Bigpoint.com <contact@bigpoint.net> Moritz Möller <mm@mxs.de>
+Canonical <contact@canonical.com> Billy Olsen <billy.olsen@canonical.com>
 Canonical <contact@canonical.com> Chris Glass <tribaal@gmail.com>
 Canonical <contact@canonical.com> James Page <james.page@ubuntu.com>
 Canonical <contact@canonical.com> Jonathan Davies <jonathan.davies@canonical.com>