]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Mon, 16 Jul 2012 23:13:55 +0000 (16:13 -0700)
committerSage Weil <sage@inktank.com>
Mon, 16 Jul 2012 23:13:55 +0000 (16:13 -0700)
1  2 
src/log/Log.cc

diff --cc src/log/Log.cc
Simple merge