]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit9df050f5d653261328aacc738ac43e78edce55c5
tree0311e5a461d7611c50fe226b04e5031aa8b0c726tree | snapshot
parent8daf2885bbae7e9181d45396d9c25ad4c0ffddf8commit | diff
parent06a7bf439139023a8dd1d4c1e675432c84c6e10ccommit | diff
Merge PR #26822 into nautilus

* refs/pull/26822/head:
osd/PG: adjust pg history on fabricated merge target if necessary

Reviewed-by: Neha Ojha <nojha@redhat.com>
src/osd/PG.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.