]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commit9bef6cf85ac31bd103300a5b0f35a332f1d216d1
tree91d8a48e501d50e608b0706a0c8c2ca68fbadc7d
parent77ec14a95bb060bc3735536dd9ace74aee49f7c7
parentdf495186423bb746fddb6b18011db27216f085c8
Merge remote-tracking branch 'upstream/pull/10514/head'

* upstream/pull/10514/head:
  src/vstart.sh: stop script aborting when ceph.cfg is not there

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