]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #23970 from noahdesu/mgr-always-on-mods-v2
authorJohn Spray <jspray@redhat.com>
Wed, 10 Oct 2018 11:17:41 +0000 (12:17 +0100)
committerGitHub <noreply@github.com>
Wed, 10 Oct 2018 11:17:41 +0000 (12:17 +0100)
mgr: always on modules v2

Reviewed-by: John Spray <john.spray@redhat.com>
1  2 
src/common/options.cc
src/mgr/Mgr.cc
src/mgr/PyModuleRegistry.cc
src/mgr/PyModuleRegistry.h
src/vstart.sh

Simple merge
diff --cc src/mgr/Mgr.cc
Simple merge
Simple merge
Simple merge
diff --cc src/vstart.sh
Simple merge