]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #26727 into master
authorSage Weil <sage@redhat.com>
Mon, 4 Mar 2019 14:13:34 +0000 (08:13 -0600)
committerSage Weil <sage@redhat.com>
Mon, 4 Mar 2019 14:13:34 +0000 (08:13 -0600)
commit0040c9915ddcec795d3047cd63ed72dfc33a4ea4
tree0785f5849c3e137a819794d32f08b194b8712207
parenta277b5c1fee510c3716a0b495370c46eeb33d496
parent01316aa7bddff8baa3a515df6b38a39ff8a1a0ac
Merge PR #26727 into master

* refs/pull/26727/head:
qa/standalone/osd/pg-split-merge: fix import_after_merge_and_gap
osd: add 'send_beacon' tell/asok command(s)

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