From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sat, 30 Jul 2016 20:33:29 +0000 (-0400)
Subject: Merge remote-tracking branch 'upstream/pull/10514/head'
X-Git-Tag: ses5-milestone5~250
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9bef6cf85ac31bd103300a5b0f35a332f1d216d1;p=ceph.git

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>
---

9bef6cf85ac31bd103300a5b0f35a332f1d216d1