]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
1  2 
src/osd/ReplicatedPG.cc
src/osd/osd_types.cc

Simple merge
Simple merge