From: Loic Dachary <loic@dachary.org>
Date: Fri, 20 Jan 2017 11:31:26 +0000 (+0100)
Subject: Merge pull request #12147 from dachary/wip-18007-jewel
X-Git-Tag: v10.2.6~154
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=174ed80fb77b172b6a7d3edb7c97cb49afe98ae8;p=ceph.git

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

jewel: ceph-disk: ceph-disk@.service races with ceph-osd@.service

Reviewed-by: Nathan Cutler <ncutler@suse.cz>
---

174ed80fb77b172b6a7d3edb7c97cb49afe98ae8