]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
* refs/pull/32949/head:
cephadm: separate out require files in config-json
cephadm: add alertmanager deployment feature

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
1  2 
src/cephadm/cephadm
src/pybind/mgr/cephadm/module.py

Simple merge
Simple merge