]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/infernalis'
authorSage Weil <sage@redhat.com>
Thu, 1 Oct 2015 15:51:50 +0000 (11:51 -0400)
committerSage Weil <sage@redhat.com>
Thu, 1 Oct 2015 15:51:50 +0000 (11:51 -0400)
commit8a21398ffb3ff588ad4b8876ea5a31fbb66e6d63
tree07dc4018ba5ac61f9f2950d36230a661f323d1b5
parent8d02f49e1244307650d1542a84456338ae8b63b3
parent99651f0eac8fca5271f6957b38cebcc6e2d8ca8a
Merge remote-tracking branch 'gh/infernalis'
src/osd/OSD.cc
src/osd/PG.cc
src/osd/ReplicatedPG.cc