]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #10364 from SUSE/wip-16750-jewel
authorLoic Dachary <loic@dachary.org>
Wed, 17 Aug 2016 11:37:51 +0000 (13:37 +0200)
committerGitHub <noreply@github.com>
Wed, 17 Aug 2016 11:37:51 +0000 (13:37 +0200)
jewel: ceph-osd-prestart.sh contains Upstart-specific code

Reviewed-by: Loic Dachary <ldachary@redhat.com>

Trivial merge