From: Loic Dachary <loic@dachary.org>
Date: Mon, 28 Oct 2013 23:13:34 +0000 (-0700)
Subject: Merge pull request #772 from ceph/wip-5612
X-Git-Tag: v0.72-rc1~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e6d983beda2b5248f2621dfed3df725af573d67f;p=ceph.git

Merge pull request #772 from ceph/wip-5612

init-ceph, upstart: make crush update on osd start time out

Reviewed-by: Loic Dachary <loic@dachary.org>
---

e6d983beda2b5248f2621dfed3df725af573d67f