]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mailmap: John Coyle affiliation
authorAbhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Fri, 11 Dec 2015 07:41:28 +0000 (13:11 +0530)
committerAbhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Fri, 11 Dec 2015 07:41:28 +0000 (13:11 +0530)
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Conflicts:
.organizationmap
Trivial merge conflict as upstream had an additional entry

.organizationmap

index b98094d3fa610e025418b21ae0fd4648f96d9941..3cea398f308fe75a57d5eada8d9f42d153ddb366 100644 (file)
@@ -389,6 +389,8 @@ Unaffiliated <no@organization.net> Jeff Weber <jweber@cofront.net>
 Unaffiliated <no@organization.net> Jiang Heng <jiangheng0511@gmail.com>
 Unaffiliated <no@organization.net> Jiantao He <hejiantao5@gmail.com>
 Unaffiliated <no@organization.net> Jian Wen <wenjian@letv.com>
+Unaffiliated <no@organization.net> Jiaying Ren <mikulely@gmail.com>
+Unaffiliated <no@organization.net> John Coyle <dx9err@gmail.com>
 Unaffiliated <no@organization.net> Jon Bernard <jbernard@tuxion.com>
 Unaffiliated <no@organization.net> Jordan Dorne <jordan.dorne@gmail.com>
 Unaffiliated <no@organization.net> Kadu Ribeiro <mail+github@carlosribeiro.me>