]> 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: fca1c70 294cab1)
Merge pull request #8291 from xiexingguo/xxg-wip-fixhistorymerge
authorSage Weil <sage@redhat.com>
Sat, 26 Mar 2016 20:13:42 +0000 (16:13 -0400)
committerSage Weil <sage@redhat.com>
Sat, 26 Mar 2016 20:13:42 +0000 (16:13 -0400)
commitc972d0cd42e4acfa7405c1204affd7cef39aa5dd
tree9767720b22e6475d088fe24ff8bf9d7c367a0b2ctree | snapshot
parentfca1c707d04b882948df1e04705fc4f6e3180026commit | diff
parent294cab11712a2dbadcf3eb5d98d4c2add4afe6a7commit | diff
Merge pull request #8291 from xiexingguo/xxg-wip-fixhistorymerge

osd: more fixes for incorrectly dirtying info; resend reply for duplicated scrub-reserve req

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