]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #26282 into master
authorSage Weil <sage@redhat.com>
Mon, 11 Feb 2019 23:26:19 +0000 (17:26 -0600)
committerSage Weil <sage@redhat.com>
Mon, 11 Feb 2019 23:26:19 +0000 (17:26 -0600)
* refs/pull/26282/head:
mon: include progress events in 'ceph status' output
mon/MgrStatMonitor: persist progress events
mgr: send progress events to mon
mgr/progress: revise message syntax a bit
mgr/progress: report events into mgr
mgr: allow progress events to be reported from modules
mgr/progress: make persist period/interval configurable
mgr/progress: prune completed events

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
1  2 
src/mgr/DaemonServer.cc
src/mon/Monitor.cc
src/pybind/mgr/mgr_module.py

Simple merge
Simple merge
Simple merge