From: Sage Weil <sage@redhat.com>
Date: Thu, 4 Feb 2016 20:03:42 +0000 (-0500)
Subject: Merge pull request #386 from ceph/RM-14646
X-Git-Tag: v1.5.32~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3abafd9dd677b8e7253a2112441e0137a4b937de;p=ceph-deploy.git

Merge pull request #386 from ceph/RM-14646

[RM-14646] check for upstart before checking for systemd
---

3abafd9dd677b8e7253a2112441e0137a4b937de