]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #13600 from dachary/wip-17821-revert
authorKefu Chai <tchaikov@gmail.com>
Tue, 28 Feb 2017 12:44:55 +0000 (20:44 +0800)
committerGitHub <noreply@github.com>
Tue, 28 Feb 2017 12:44:55 +0000 (20:44 +0800)
ceph-disk: Revert "Revert "change get_dmcrypt_key test to support different cluster name""

Reviewed-by: Kefu Chai <kchai@redhat.com>

Trivial merge