]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-cephx'
authorSage Weil <sage@inktank.com>
Fri, 18 Jan 2013 01:01:49 +0000 (17:01 -0800)
committerSage Weil <sage@inktank.com>
Fri, 18 Jan 2013 01:01:49 +0000 (17:01 -0800)
commit233d034d32714172b1bac305617b3e6d7a00d9ac
tree79e41105dfad5ec47ab080596a368b062cbd55c4
parent60db6e3e394df1e4110eefa5951657b648b02006
parentefa595f5d3e5d860029c063957b56e11e3aed8a9
Merge branch 'wip-cephx'

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
src/common/config_opts.h