]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'upstream/pull/10312/head'
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 29 Jul 2016 15:13:48 +0000 (11:13 -0400)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 29 Jul 2016 15:13:48 +0000 (11:13 -0400)
* upstream/pull/10312/head:
  vstart: refactor and fix forced config changes
  vstart: cleanup echoed commands and sh issues


Trivial merge