]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote branch 'gh/wip-defaults'
authorSage Weil <sage.weil@dreamhost.com>
Fri, 13 Apr 2012 05:36:48 +0000 (22:36 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Fri, 13 Apr 2012 05:36:48 +0000 (22:36 -0700)
1  2 
src/common/config_opts.h
src/init-ceph.in

Simple merge
Simple merge