]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 210fb41 92b4909)
Merge PR #33216 into master
authorSage Weil <sage@redhat.com>
Thu, 13 Feb 2020 01:09:05 +0000 (19:09 -0600)
committerSage Weil <sage@redhat.com>
Thu, 13 Feb 2020 01:09:05 +0000 (19:09 -0600)
* refs/pull/33216/head:
cephadm: avoid trigger old podman bug
qa/workunits/cephadm/test_cephadm.sh: wait longer for grafana

Reviewed-by: Michael Fritch <mfritch@suse.com>

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