]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'logging'
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Wed, 2 Mar 2011 14:40:45 +0000 (06:40 -0800)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Wed, 2 Mar 2011 14:40:45 +0000 (06:40 -0800)
1  2 
src/osd/OSD.cc
src/osd/OSD.h

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