From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 29 Jul 2016 15:13:48 +0000 (-0400)
Subject: Merge remote-tracking branch 'upstream/pull/10312/head'
X-Git-Tag: ses5-milestone5~255
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a955647a2df526d7ffa55c4775c5e43d3d016e2c;p=ceph.git

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

* upstream/pull/10312/head:
  vstart: refactor and fix forced config changes
  vstart: cleanup echoed commands and sh issues
---

a955647a2df526d7ffa55c4775c5e43d3d016e2c