]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4040e2a 2ce480b)
Merge PR #22554 into master
authorSage Weil <sage@redhat.com>
Thu, 14 Jun 2018 18:04:56 +0000 (13:04 -0500)
committerSage Weil <sage@redhat.com>
Thu, 14 Jun 2018 18:04:56 +0000 (13:04 -0500)
* refs/pull/22554/head:
qa/standalone/ceph-helpers.sh: Fixing comment for wait_for_health()
tests: Protecting rados bench against endless loop
qa/standalone/ceph-helpers.sh: Defining custom timeout for wait_for_clean()

Reviewed-by: Piotr Dałek <piotr.dalek@corp.ovh.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>

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