]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Tue, 18 Jun 2013 02:55:55 +0000 (19:55 -0700)
committerSage Weil <sage@inktank.com>
Tue, 18 Jun 2013 02:55:55 +0000 (19:55 -0700)
1  2 
src/client/Client.cc
src/init-ceph.in

Simple merge
Simple merge