]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 156defa 8990280)
Merge PR #43287 into master
authorSage Weil <sage@newdream.net>
Wed, 29 Sep 2021 18:38:47 +0000 (14:38 -0400)
committerSage Weil <sage@newdream.net>
Wed, 29 Sep 2021 18:38:47 +0000 (14:38 -0400)
* refs/pull/43287/head:
mgr/rook, qa/tasks/rook: change rgw daemon service name
mgr/rook: fix placement_spec_to_node_selector
mgr/rook: orch rm no longer uses rook api delete
qa/tasks/rook: fix cluster deletion hanging due to CephObjectStore CR
mgr/rook: use default replication size in orch apply rgw
mgr/rook: add placement specs to apply rgw

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

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