]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2dca76a 6fcb367)
Merge PR #29780 into master
authorSage Weil <sage@redhat.com>
Thu, 22 Aug 2019 17:52:16 +0000 (12:52 -0500)
committerSage Weil <sage@redhat.com>
Thu, 22 Aug 2019 17:52:16 +0000 (12:52 -0500)
* refs/pull/29780/head:
osd/PeeringState: semi-colon after DECLARE_LOCALS
osd/PeeringState: on_new_interval on child PG after split

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.