]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 713ebcd 378a6fc)
Merge PR #21536 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 24 Apr 2018 04:27:55 +0000 (21:27 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 24 Apr 2018 04:27:55 +0000 (21:27 -0700)
* refs/pull/21536/head:
qa: check old_max_mds is not wiped by marked down twice
MDSMonitor: do not wipe old_max_mds when marked down twice

Reviewed-by: Douglas Fuller <dfuller@redhat.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.