]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #4105 from athanatos/wip-11110
authorSamuel Just <sam.just@inktank.com>
Thu, 19 Mar 2015 16:41:58 +0000 (09:41 -0700)
committerSamuel Just <sam.just@inktank.com>
Thu, 19 Mar 2015 16:41:58 +0000 (09:41 -0700)
Wip 11110

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/common/config_opts.h

Simple merge