]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-config'
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Mon, 8 Aug 2011 16:55:49 +0000 (09:55 -0700)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Mon, 8 Aug 2011 16:55:49 +0000 (09:55 -0700)
1  2 
src/include/ceph/libceph.h
src/osd/OSD.cc

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