]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb5ca24 93bc8c5)
Merge PR #21810 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 8 May 2018 16:04:56 +0000 (09:04 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 8 May 2018 16:04:56 +0000 (09:04 -0700)
* refs/pull/21810/head:
MDSMonitor: promote standby after fs creation
MDSMonitor: always prints standbys even if no fs

Reviewed-by: John Spray <john.spray@redhat.com>
1  2 
src/mon/FSCommands.cc patch | diff1 | diff2 | blob | history

diff --cc src/mon/FSCommands.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.