From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 9 Dec 2016 16:09:02 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/pull/1302/head'
X-Git-Tag: v11.1.1~58^2^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=79c2db9bead204bf565e71847bdd3282e3c17e5c;p=ceph.git

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

* upstream/pull/1302/head:
  fsx-mpi: fsx-mpi expects a file name not a dir
  fsx-mpi: remove chef task
  Fix mpi calls
---

79c2db9bead204bf565e71847bdd3282e3c17e5c