]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #27595 into master
authorSage Weil <sage@redhat.com>
Sat, 20 Apr 2019 13:52:01 +0000 (08:52 -0500)
committerSage Weil <sage@redhat.com>
Sat, 20 Apr 2019 13:52:01 +0000 (08:52 -0500)
* refs/pull/27595/head:
osd: add 'ceph osd stop <osd.nnn>' command

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
qa/standalone/osd/osd-markdown.sh
src/mon/OSDMonitor.cc
src/osd/OSD.cc
src/osd/OSDMap.cc
src/osd/OSDMap.h

Simple merge
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
Simple merge
Simple merge