Merge pull request #12147 from dachary/wip-18007-jewel

author Loic Dachary <loic@dachary.org>

Fri, 20 Jan 2017 11:31:26 +0000 (12:31 +0100)

committer GitHub <noreply@github.com>

Fri, 20 Jan 2017 11:31:26 +0000 (12:31 +0100)
author Loic Dachary <loic@dachary.org>
Fri, 20 Jan 2017 11:31:26 +0000 (12:31 +0100)
committer GitHub <noreply@github.com>
Fri, 20 Jan 2017 11:31:26 +0000 (12:31 +0100)
diff --cc src/ceph-disk/ceph_disk/main.py
Simple merge
diff --cc systemd/ceph-disk@.service
Simple merge
author	Loic Dachary <loic@dachary.org>
	Fri, 20 Jan 2017 11:31:26 +0000 (12:31 +0100)
committer	GitHub <noreply@github.com>
	Fri, 20 Jan 2017 11:31:26 +0000 (12:31 +0100)
		1	2
src/ceph-disk/ceph_disk/main.py	patch \|	diff1 \|	diff2 \|	blob \| history
systemd/ceph-disk@.service	patch \|	diff1 \|	diff2 \|	blob \| history