]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a158e28 a08c0fb)
Merge pull request #44829 from adk3798/pacific-cpu-limit
authorAdam King <47704447+adk3798@users.noreply.github.com>
Wed, 16 Feb 2022 20:03:26 +0000 (15:03 -0500)
committerGitHub <noreply@github.com>
Wed, 16 Feb 2022 20:03:26 +0000 (15:03 -0500)
pacific: mgr/cephadm: allow miscellaneous container args at service level

Reviewed-by: Michael Fritch mfritch@suse.com
1  2 
src/cephadm/cephadm patch | diff1 | diff2 | blob | history
src/pybind/mgr/cephadm/serve.py patch | diff1 | diff2 | blob | history
src/pybind/mgr/cephadm/tests/test_services.py patch | diff1 | diff2 | blob | history

diff --cc src/cephadm/cephadm
Simple merge
diff --cc src/pybind/mgr/cephadm/serve.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.