]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #24025 into master
authorSage Weil <sage@redhat.com>
Wed, 12 Sep 2018 16:51:58 +0000 (11:51 -0500)
committerSage Weil <sage@redhat.com>
Wed, 12 Sep 2018 16:51:58 +0000 (11:51 -0500)
* refs/pull/24025/head:
mon/OSDMonitor: reject pg_num -> 0

Reviewed-by: huangjun <huangjun@xsky.com>
Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
qa/workunits/cephtool/test.sh
src/mon/OSDMonitor.cc

Simple merge
Simple merge