]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'upstream/next'
authorSamuel Just <sam.just@inktank.com>
Tue, 29 Oct 2013 05:51:04 +0000 (22:51 -0700)
committerSamuel Just <sam.just@inktank.com>
Tue, 29 Oct 2013 05:51:04 +0000 (22:51 -0700)
1  2 
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h

Simple merge
Simple merge