]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a277b5c 01316aa)
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)
* 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>

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