]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #33996 from mdw-at-linuxbox/wip-master-kmip
authorMatt Benjamin <mbenjamin@redhat.com>
Fri, 5 Mar 2021 21:20:18 +0000 (16:20 -0500)
committerGitHub <noreply@github.com>
Fri, 5 Mar 2021 21:20:18 +0000 (16:20 -0500)
rgw / kmip kms

1  2 
qa/tasks/rgw.py
src/common/options.cc

diff --cc qa/tasks/rgw.py
Simple merge
Simple merge