]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'testing' into next
authorSamuel Just <sam.just@inktank.com>
Wed, 15 Aug 2012 22:19:02 +0000 (15:19 -0700)
committerSamuel Just <sam.just@inktank.com>
Wed, 15 Aug 2012 22:19:02 +0000 (15:19 -0700)
1  2 
src/osd/PG.cc
src/osd/PG.h

diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge