From: Patrick Donnelly <batrick@batbytes.com>
Date: Wed, 8 Jun 2016 17:11:43 +0000 (-0400)
Subject: Merge remote-tracking branch 'upstream/pull/1045/head'
X-Git-Tag: v11.1.1~58^2^2~179
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb61c1fabaf3a13ed50e12898b457c926b8a84f6;p=ceph.git

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

* upstream/pull/1045/head:
  tasks/cephfs: fix vstart runner _get_pid

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

bb61c1fabaf3a13ed50e12898b457c926b8a84f6