From: Sage Weil <sage@redhat.com>
Date: Tue, 26 Jun 2018 21:57:37 +0000 (-0500)
Subject: Merge PR #22294 into master
X-Git-Tag: v14.0.1~1009
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=af13810872d58dfa303c53d38d41767c0d1bc474;p=ceph.git

Merge PR #22294 into master

* refs/pull/22294/head:
	common/performance: Now hobject_t's hash no longer depends directly on oid.
	common/performance: improved hash calculation for hobject_t and ghobject_t

Reviewed-by: Paul Emmerich <paul.emmerich@croit.io>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

af13810872d58dfa303c53d38d41767c0d1bc474
diff --cc .githubmap
index d3666d6cc16a,df79d49a6c3e..e7f0600d61d4
--- a/.githubmap
+++ b/.githubmap
@@@ -58,9 -58,4 +58,10 @@@ chardan Jesse Williamson <jwilliamson@s
  jdurgin Josh Durgin <jdurgin@redhat.com>
  jan--f Jan Fajerski <jfajerski@suse.com>
  idryomov Ilya Dryomov <idryomov@redhat.com>
 +varadakari Varada Kari <varadaraja.kari@flipkart.com>
 +ErwanAliasr1 Erwan Velu <erwan@redhat.com>
 +alfredodeza Alfredo Deza <adeza@redhat.com>
 +dmick Dan Mick <dmick@redhat.com>
 +aclamk Adam Kupczyk <akucpzyk@redhat.com>
 +mogeb Mohamad Gebai <mgebai@suse.com>
+ emmericp Paul Emmerich <paul.emmerich@croit.io>