]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commit67355779ecc456f329c122672f32c87aa5a94d04
tree4514c198a342eb8a1efe7cf94a7e774691092b10
parentc916905a8a14029653aae45f0a9fb6c9b4c39e05
parentb9224d81c936a564f8a8adb612691eee71aa9a35
Merge branch 'logging'
src/osd/OSD.cc
src/osd/OSD.h