]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #506 from dmick/wip-admin-daemon
authorSage Weil <sage@inktank.com>
Fri, 16 Aug 2013 00:14:23 +0000 (17:14 -0700)
committerSage Weil <sage@inktank.com>
Fri, 16 Aug 2013 00:14:23 +0000 (17:14 -0700)
Reviewed-by: Sage Weil <sage@inktank.com>

Trivial merge