]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Revert "Revert "ceph-disk: change get_dmcrypt_key test to support different cluster... 13600/head
authorLoic Dachary <ldachary@redhat.com>
Thu, 23 Feb 2017 06:58:12 +0000 (07:58 +0100)
committerLoic Dachary <ldachary@redhat.com>
Thu, 23 Feb 2017 06:58:12 +0000 (07:58 +0100)
commitd6d2e72dac2c9633d0387566c235ebbb815f2cb2
tree4e2566966a8fd7edad01d3ac6867b1c20fc29b0a
parentc733d48580da2d8ac99a382fab0785becc24cdbb
Revert "Revert "ceph-disk: change get_dmcrypt_key test to support different cluster name""

This reverts commit d3409d456233f7bc1c0ed23dbc2db29627d33d5c which
reverted 1c747473600a9a7f528ad71a889c35d85ac115b1. Although in the same
pull request, 1c747473600a9a7f528ad71a889c35d85ac115b1 was a fix for
d98d4dbc2741295723f0a316b5bf81f07b140041. The two should have been
squashed but they were not.

When reverting the pull request I reverted all the commits in the pull
request but I did it in the wrong order and the fix became the
problem. Luckily the outcome is a noop instead of a bug, reason why
it was undetected by the tests.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
src/ceph-disk/ceph_disk/main.py