]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #22940 into master
authorSage Weil <sage@redhat.com>
Tue, 10 Jul 2018 13:42:27 +0000 (08:42 -0500)
committerSage Weil <sage@redhat.com>
Tue, 10 Jul 2018 13:42:27 +0000 (08:42 -0500)
commit737b9e3ef8d158f05b5d04af86992ce0ea5d04de
tree5298d01733152f42373866c3b5f504d8c5492f9d
parentc63be04dee46d94bddfe9a4ba68b9de58dae201c
parent95b2281f9d7bb76ac6342998ff494d04421a7f95
Merge PR #22940 into master

* refs/pull/22940/head:
mon/OSDMonitor: add 'osd repeer <pgid>' command

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
src/mon/Monitor.cc
src/mon/OSDMonitor.cc