]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #7552 from dachary/wip-14669-key-management
authorSage Weil <sage@redhat.com>
Wed, 9 Mar 2016 15:31:53 +0000 (10:31 -0500)
committerSage Weil <sage@redhat.com>
Wed, 9 Mar 2016 15:31:53 +0000 (10:31 -0500)
ceph-disk: key management support

Reviewed-by: Sage Weil <sage@redhat.com>

Trivial merge