]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac8dcdb 5939eac)
Merge pull request #772 from ceph/wip-5612
authorLoic Dachary <loic@dachary.org>
Mon, 28 Oct 2013 23:13:34 +0000 (16:13 -0700)
committerLoic Dachary <loic@dachary.org>
Mon, 28 Oct 2013 23:13:34 +0000 (16:13 -0700)
init-ceph, upstart: make crush update on osd start time out

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.