From: Kefu Chai <tchaikov@gmail.com>
Date: Tue, 28 Feb 2017 12:44:55 +0000 (+0800)
Subject: Merge pull request #13600 from dachary/wip-17821-revert
X-Git-Tag: v12.0.1~243
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50a0fe4fc9d5ced6013a2a0c920ed79c247ef399;p=ceph.git

Merge pull request #13600 from dachary/wip-17821-revert

ceph-disk: Revert "Revert "change get_dmcrypt_key test to support different cluster name""

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

50a0fe4fc9d5ced6013a2a0c920ed79c247ef399