]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #28567 into master
authorSage Weil <sage@redhat.com>
Fri, 21 Jun 2019 13:38:39 +0000 (08:38 -0500)
committerSage Weil <sage@redhat.com>
Fri, 21 Jun 2019 13:38:39 +0000 (08:38 -0500)
commit00952582ddd1200abe16e4e14fb437899cdd873e
tree711e033529d8108390f7c74e913336c9e48ca741
parent07e02c47ff49b627f86aa47085fcc10e8eec6cce
parent65b6adfc88932f39e2ba4b14e1f8e87dfd8f3c21
Merge PR #28567 into master

* refs/pull/28567/head:
Revert "mon/OSDMonitor: report pg[pgp]_num_target instead of pg[pgp]_num"

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
src/mon/OSDMonitor.cc