]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #16631 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 3 Aug 2017 20:55:33 +0000 (13:55 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 3 Aug 2017 20:55:33 +0000 (13:55 -0700)
* 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>
1  2 
src/mds/MDSRank.cc

Simple merge