]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #26492 into master
authorSage Weil <sage@redhat.com>
Wed, 20 Feb 2019 13:02:44 +0000 (07:02 -0600)
committerSage Weil <sage@redhat.com>
Wed, 20 Feb 2019 13:02:44 +0000 (07:02 -0600)
commit75cf9e6f26ca55302c137b2a8bebb85a39e67236
tree25220e8fc32af3c63366484fa6b510326cceade7
parent09935f0473f8816b03c29c0ec31722e7acea161c
parentd7ba11550cf9f39152ab37f50cf22849317b12e1
Merge PR #26492 into master

* refs/pull/26492/head:
osd: fix pg split/merge prime during startup

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>