]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSamuel Just <sam.just@inktank.com>
Mon, 17 Jun 2013 20:29:57 +0000 (13:29 -0700)
committerSamuel Just <sam.just@inktank.com>
Mon, 17 Jun 2013 20:29:57 +0000 (13:29 -0700)
1  2 
src/client/Client.cc
src/osd/OSD.cc

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