From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 3 Aug 2017 20:55:33 +0000 (-0700)
Subject: Merge PR #16631 into master
X-Git-Tag: v12.1.3~117
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3755649a4fb19dbf7cc8f5d6929a3503445b0d77;p=ceph-ci.git

Merge PR #16631 into master

* refs/remotes/upstream/pull/16631/head:
	cephfs: Resend discover when joining from starting state
	cephfs: Wait for MDCache to be ready before starting log segment

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

3755649a4fb19dbf7cc8f5d6929a3503445b0d77