]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cae0756 8ef6866)
Merge PR #25974 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sun, 20 Jan 2019 01:19:19 +0000 (17:19 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Sun, 20 Jan 2019 01:19:19 +0000 (17:19 -0800)
* refs/pull/25974/head:
MDSMonitor: add missing OSDMonitor writeable check
MDSMonitor: codify constraint for writeable OSDMap

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/mon/FSCommands.cc patch | diff1 | diff2 | blob | history
src/mon/MDSMonitor.cc patch | diff1 | diff2 | blob | history

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