]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc7d268 4d3b4cd)
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)
* upstream/pull/1045/head:
  tasks/cephfs: fix vstart runner _get_pid

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.