]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'upstream/pull/15822/head' into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Jul 2017 05:14:32 +0000 (22:14 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Jul 2017 05:14:32 +0000 (22:14 -0700)
commit5b873011925d1aba8d8c8885260274bf877b6b4f
tree5edc2d10db5ced7ca4de15d13fbd99ee50f8722e
parent77b707a6eaf5d45983288c46f06feb485b7fc6f2
parent95c0ca6a2b0870354506e2b8f40cb00eca1df81b
Merge remote-tracking branch 'upstream/pull/15822/head' into master

* upstream/pull/15822/head:
  qa: add timeout/repeat to pool df

Reviewed-by: John Spray <jspray@redhat.com>