]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13c0f27 4fe55af)
Merge PR #39304 into master
authorSage Weil <sage@newdream.net>
Thu, 18 Feb 2021 17:38:43 +0000 (12:38 -0500)
committerSage Weil <sage@newdream.net>
Thu, 18 Feb 2021 17:38:43 +0000 (12:38 -0500)
* refs/pull/39304/head:
qa/tasks/ceph: set ctx.ceph[cluster_name].fsid
qa/tasks/rgw: pass fsid to rgw daemon
qa/suites/upgrade/octopus-x: reenable ragweed
qa/suites/upgarde/octopus-x: rename yaml file

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

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