From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 2 Aug 2016 19:40:49 +0000 (-0400)
Subject: Merge remote-tracking branch 'upstream/pull/10543/head'
X-Git-Tag: ses5-milestone5~224
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c162a8a08d8aea57cb1d8374ed71c265a207372d;p=ceph.git

Merge remote-tracking branch 'upstream/pull/10543/head'

* upstream/pull/10543/head:
  vstart.sh: only delete conf if -n
---

c162a8a08d8aea57cb1d8374ed71c265a207372d