]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'upstream/pull/1045/head'
authorPatrick Donnelly <batrick@batbytes.com>
Wed, 8 Jun 2016 17:11:43 +0000 (13:11 -0400)
committerPatrick Donnelly <batrick@batbytes.com>
Wed, 8 Jun 2016 17:11:43 +0000 (13:11 -0400)
commitbb61c1fabaf3a13ed50e12898b457c926b8a84f6
treed11c57867a9de2559b08dad291ecec3ffffa9c77
parentfc7d268e3b78eee8841123c49f5c7261d5d3335d
parent4d3b4cd753b0e7797d8178c5f28a8d37cdc905e3
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>