]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'master' into wip-scrub
authorSage Weil <sage@inktank.com>
Wed, 16 Jan 2013 21:17:41 +0000 (13:17 -0800)
committerSage Weil <sage@inktank.com>
Wed, 16 Jan 2013 21:17:41 +0000 (13:17 -0800)
1  2 
src/osd/OSD.cc
src/osd/PG.h

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