]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'upstream/pull/10543/head'
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 2 Aug 2016 19:40:49 +0000 (15:40 -0400)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 2 Aug 2016 19:40:49 +0000 (15:40 -0400)
commitc162a8a08d8aea57cb1d8374ed71c265a207372d
tree4a423d77cfb6d87026143ced6a6df32a907fb2b7
parent119f06fcc4ce0e8c5dbe3886af420afe2e244b9e
parentc3ca7ad40ccc4d20749447d7db3d8593f4fd5ed6
Merge remote-tracking branch 'upstream/pull/10543/head'

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