]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #13617 from liewegas/wip-mgr-commands
authorSage Weil <sage@newdream.net>
Thu, 30 Mar 2017 22:12:00 +0000 (17:12 -0500)
committerGitHub <noreply@github.com>
Thu, 30 Mar 2017 22:12:00 +0000 (17:12 -0500)
mon,mgr: tag some commands for ceph-mgr

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/common/config_opts.h
src/mon/Monitor.cc
src/mon/Monitor.h
src/mon/OSDMonitor.cc
src/mon/PGMap.cc
src/mon/PGMap.h
src/mon/PGMonitor.cc
src/mon/PGMonitor.h
src/osd/OSD.cc
src/osd/OSD.h
src/test/encoding/types.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/mon/PGMap.h
Simple merge
Simple merge
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
Simple merge