From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 9 Jul 2018 04:06:26 +0000 (-0700)
Subject: Merge PR #22741 into master
X-Git-Tag: v14.0.1~919
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0918f8fd4f7b7f109d92fa0d35ce9c42c194615d;p=ceph.git

Merge PR #22741 into master

* refs/pull/22741/head:
	qa: fix ffsb cd argument
	qa: fix cd argument during iogen unpack

Reviewed-by: Neha Ojha <nojha@redhat.com>
---

0918f8fd4f7b7f109d92fa0d35ce9c42c194615d
diff --cc .githubmap
index c9f003dc783c,20fd1b28e79e..4ff367dbfec7
--- a/.githubmap
+++ b/.githubmap
@@@ -76,5 -76,4 +76,6 @@@ yehudasa Yehuda Sadeh <yehuda@redhat.co
  yunfeiguan Yunfei Guan <yunfei.guan@xtaotech.com>
  yuriw Yuri Weinstein <yweins@redhat.com>
  yuyuyu101 Haomai Wang <haomai@xsky.com>
 +wido Wido den Hollander <wido@42on.com>
 +rishabh-d-dave Rishabh Dave <ridave@redhat.com>
+ neha-ojha Neha Ojha <nojha@redhat.com>