]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commit04dad6beaf3f8eefd5ece92cff3622282521fff3
tree2455e76ef7e29b502598759216db5b207f9a8794
parent578d8b82c88d19c4268fa3fb8a43a2c2b6408f9c
parent06a7bf439139023a8dd1d4c1e675432c84c6e10c
Merge PR #26822 into master

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

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