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

Reviewed-by: Neha Ojha <nojha@redhat.com>
1  2 
src/osd/PG.cc patch | diff1 | diff2 | blob | history

diff --cc src/osd/PG.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.