From: Ilya Dryomov <idryomov@gmail.com>
Date: Thu, 7 Mar 2019 11:19:36 +0000 (+0100)
Subject: Merge PR #26775 into master
X-Git-Tag: v14.1.1~38
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e50aa559f673f28f51aeeaea8413325d61f61f15;p=ceph.git

Merge PR #26775 into master

* refs/pull/26775/head:
	qa/suites/krbd/wac: bluestore snippet is placed incorrectly

Reviewed-by: Mike Christie <mchristi@redhat.com>
---

e50aa559f673f28f51aeeaea8413325d61f61f15
diff --cc .githubmap
index 6dfa73706f1,6dfa73706f1..253e5a11ecb
--- a/.githubmap
+++ b/.githubmap
@@@ -93,3 -93,3 +93,4 @@@ djgalloway David Galloway <dgallowa@red
  Yan-waller yanjun <yan.jun8@zte.com.cn>
  b-ranto Boris Ranto <branto@redhat.com>
  yuvalif Yuval Lifshitz <ylifshit@redhat.com>
++mikechristie Mike Christie <mchristi@redhat.com>