]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5b87301 47ab651)
Merge remote-tracking branch 'upstream/pull/15844/head' into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Jul 2017 05:15:33 +0000 (22:15 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Jul 2017 05:16:02 +0000 (22:16 -0700)
commit8f121c70d346fad30da820810cc685ce06dded0d
tree25f88b0841a2a34e1b37edccca350beeb3edecb4tree | snapshot
parent5b873011925d1aba8d8c8885260274bf877b6b4fcommit | diff
parent47ab651a1f94cb8b13e550f8a1648d8e81705655commit | diff
Merge remote-tracking branch 'upstream/pull/15844/head' into master

* commit '47ab651a1f':
  qa: reset journal before cephfs_journal_tool_smoke.sh exits
  qa: remove 'apply' from journal_tool_smoke.sh

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Unnamed repository; edit this file 'description' to name the repository.