]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02e7e83 0a6d76f)
Merge remote-tracking branch 'upstream/pull/1302/head'
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 9 Dec 2016 16:09:02 +0000 (11:09 -0500)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 9 Dec 2016 16:09:02 +0000 (11:09 -0500)
* upstream/pull/1302/head:
  fsx-mpi: fsx-mpi expects a file name not a dir
  fsx-mpi: remove chef task
  Fix mpi calls


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