]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'upstream/next'
authorSamuel Just <sam.just@inktank.com>
Fri, 15 Nov 2013 05:40:01 +0000 (21:40 -0800)
committerSamuel Just <sam.just@inktank.com>
Fri, 15 Nov 2013 05:40:01 +0000 (21:40 -0800)
commit7e53473a7aaa68e03843c521022b9e60b33e4ef3
tree36a865036882a669eb22b062b27360bc4211d40e
parent2555dd7b63a08d3046655168806adb5862ddd543
parent878f3540d1a69d0ca7d2014ba7a9f3cb5cfd986d
Merge remote-tracking branch 'upstream/next'
src/osd/ReplicatedPG.cc
src/osd/osd_types.cc