Merge pull request #11786 from leseb/dmcrypt-cluster-name

author Loic Dachary <loic@dachary.org>

Fri, 17 Feb 2017 08:55:19 +0000 (09:55 +0100)

committer GitHub <noreply@github.com>

Fri, 17 Feb 2017 08:55:19 +0000 (09:55 +0100)
author Loic Dachary <loic@dachary.org>
Fri, 17 Feb 2017 08:55:19 +0000 (09:55 +0100)
committer GitHub <noreply@github.com>
Fri, 17 Feb 2017 08:55:19 +0000 (09:55 +0100)
diff --cc src/ceph-disk/ceph_disk/main.py
Simple merge
diff --cc src/ceph-disk/tests/test_prepare.py
Simple merge
author	Loic Dachary <loic@dachary.org>
	Fri, 17 Feb 2017 08:55:19 +0000 (09:55 +0100)
committer	GitHub <noreply@github.com>
	Fri, 17 Feb 2017 08:55:19 +0000 (09:55 +0100)
		1	2
src/ceph-disk/ceph_disk/main.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/ceph-disk/tests/test_prepare.py	patch \|	diff1 \|	diff2 \|	blob \| history