]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
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)
commitd850edf0f960cd0317b47eb2b6ca07bb1af23481
tree0641879a0849b34b0609eb35acea5503ecd3129f
parent2dca76ac843aa9b0dc60bfc368baca9c08869c0b
parent6fcb367d6aed2e32eca196e4e0067c2929139d31
Merge PR #29780 into master

* 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>