Merge pull request #15509 from ceph/wip-ceph-disk-fix-kraken

author Nathan Cutler <presnypreklad@gmail.com>

Wed, 2 Aug 2017 05:55:48 +0000 (07:55 +0200)

committer GitHub <noreply@github.com>

Wed, 2 Aug 2017 05:55:48 +0000 (07:55 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Wed, 2 Aug 2017 05:55:48 +0000 (07:55 +0200)
committer GitHub <noreply@github.com>
Wed, 2 Aug 2017 05:55:48 +0000 (07:55 +0200)
diff --cc ceph.spec.in
Simple merge
diff --cc src/ceph-disk/ceph_disk/main.py
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Wed, 2 Aug 2017 05:55:48 +0000 (07:55 +0200)
committer	GitHub <noreply@github.com>
	Wed, 2 Aug 2017 05:55:48 +0000 (07:55 +0200)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/ceph-disk/ceph_disk/main.py	patch \|	diff1 \|	diff2 \|	blob \| history