]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #26995 into nautilus
authorSage Weil <sage@redhat.com>
Fri, 15 Mar 2019 20:29:04 +0000 (15:29 -0500)
committerSage Weil <sage@redhat.com>
Fri, 15 Mar 2019 20:29:04 +0000 (15:29 -0500)
* refs/pull/26995/head:
osd/PG: fix pg merge check for rc clusters

Reviewed-by: Neha Ojha <nojha@redhat.com>

Trivial merge