]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 031b9ed 5e34beb)
Merge pull request #893 from jdurgin/wip-init-highlander
authorSage Weil <sage@inktank.com>
Wed, 4 Dec 2013 00:39:38 +0000 (16:39 -0800)
committerSage Weil <sage@inktank.com>
Wed, 4 Dec 2013 00:39:38 +0000 (16:39 -0800)
init, upstart: prevent daemons being started by both

Reviewed-by: Sage Weil <sage@inktank.com>

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