]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 72c4fc7 3d8e73b)
Merge branch 'master' into wip-unauthorized-gids
authorIlya Dryomov <idryomov@gmail.com>
Tue, 13 Apr 2021 11:57:30 +0000 (13:57 +0200)
committerIlya Dryomov <idryomov@gmail.com>
Tue, 13 Apr 2021 13:42:06 +0000 (15:42 +0200)
commit7eb9c5ddb261daf04ac10370caa28b7da6dd98f9
tree43a6b0dc55bb35d979a330fad2efd87ec733088etree | snapshot
parent72c4fc75ad301980baebc7789ed6391444057e5bcommit | diff
parent3d8e73b266615316d9f9ee38a628b29c2b00322bcommit | diff
Merge branch 'master' into wip-unauthorized-gids

Sync up with master up to commit 3d8e73b26661 ("Merge pull request
#40731 from tchaikov/wip-yamlize-options").  Specifically, bring in
src/common/options.cc yamlization and move new auth-related options
into src/common/options/global.yaml.in.

Conflicts:
src/common/options.cc
src/common/options/global.yaml.in

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
src/cephadm/cephadm diff1 | diff2 | blob | history
src/common/options/global.yaml.in | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.