]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #31440 into master
authorSage Weil <sage@redhat.com>
Wed, 6 Nov 2019 15:46:36 +0000 (09:46 -0600)
committerSage Weil <sage@redhat.com>
Wed, 6 Nov 2019 15:46:36 +0000 (09:46 -0600)
commite326dfbc6128829a124f2fc9b38528ddc137e345
tree222c6d531228e403fc534d634d0d39f74d98049e
parent5964f5f2bd07177d75cdd0218b57d5451782d6f3
parent5eaf13303848f91bd4ab2a441769d15fe5ffca9e
Merge PR #31440 into master

* refs/pull/31440/head:
qa/standalone/test_ceph_daemon: Make container images configurable
qa/standalone/test_ceph_daemon: Allow running from root dir
qa/standalone/test_ceph_daemon: Fix hang when CEPH_DAEMON is not set

Reviewed-by: Sage Weil <sage@redhat.com>