]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #30836 into master
authorSage Weil <sage@redhat.com>
Sat, 12 Oct 2019 18:32:52 +0000 (13:32 -0500)
committerSage Weil <sage@redhat.com>
Sat, 12 Oct 2019 18:32:52 +0000 (13:32 -0500)
* refs/pull/30836/head:
osd/PeeringState: send pg_info2 if release >= octopus

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>

Trivial merge