]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'upstream/pull/10514/head'
authorPatrick Donnelly <pdonnell@redhat.com>
Sat, 30 Jul 2016 20:33:29 +0000 (16:33 -0400)
committerPatrick Donnelly <pdonnell@redhat.com>
Sat, 30 Jul 2016 20:33:29 +0000 (16:33 -0400)
* upstream/pull/10514/head:
  src/vstart.sh: stop script aborting when ceph.cfg is not there

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Trivial merge