]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'dont-cache-recovery' of git://github.com/yuyuyu101/ceph
authorSage Weil <sage@redhat.com>
Thu, 20 Aug 2015 19:20:44 +0000 (15:20 -0400)
committerSage Weil <sage@redhat.com>
Thu, 20 Aug 2015 19:20:44 +0000 (15:20 -0400)
commit5686d9badb0ba9e0d1b292271d28a36ce6a1f977
tree9f3c6b71c0f298ccb19e571772e90dc64c1a99d4
parent779466e34df1d8bcc8ec4990e5497e4e398d3402
parentfabd6357e42e526d2704d7cb80375c12d731df8d
Merge branch 'dont-cache-recovery' of git://github.com/yuyuyu101/ceph

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
# Conflicts:
# src/osd/ReplicatedBackend.cc
# src/osd/ReplicatedBackend.h
# src/osd/ReplicatedPG.cc
src/osd/ECBackend.cc
src/osd/PGBackend.h
src/osd/ReplicatedBackend.cc
src/osd/ReplicatedBackend.h
src/osd/ReplicatedPG.cc