]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage.weil@dreamhost.com>
Wed, 18 May 2011 04:08:00 +0000 (21:08 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Wed, 18 May 2011 04:08:00 +0000 (21:08 -0700)
1  2 
src/crushtool.cc
src/osd/PG.cc

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