]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 578d8b8 06a7bf4)
Merge PR #26822 into master
authorSage Weil <sage@redhat.com>
Sat, 16 Mar 2019 22:15:33 +0000 (17:15 -0500)
committerSage Weil <sage@redhat.com>
Sat, 16 Mar 2019 22:15:33 +0000 (17:15 -0500)
* refs/pull/26822/head:
osd/PG: adjust pg history on fabricated merge target if necessary

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

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