]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 34b78df f49b600)
Merge PR #32949 into master
authorSage Weil <sage@redhat.com>
Wed, 19 Feb 2020 02:56:54 +0000 (20:56 -0600)
committerSage Weil <sage@redhat.com>
Wed, 19 Feb 2020 02:56:54 +0000 (20:56 -0600)
commit99c0813a6c5c741856814aa46e89cb6a26dd7f6a
treeeee89bec492636771aea862771c1d044765bcbb1tree | snapshot
parent34b78df4806461862bdb6c04b6a0c7d82df0780acommit | diff
parentf49b600fb8782cf38925bbc04ead75ca0980837bcommit | diff
Merge PR #32949 into master

* refs/pull/32949/head:
cephadm: separate out require files in config-json
cephadm: add alertmanager deployment feature

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
src/cephadm/cephadm diff1 | diff2 | blob | history
src/pybind/mgr/cephadm/module.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.