]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #843 from ceph/wip-osd-metadata
authorSage Weil <sage@inktank.com>
Tue, 3 Dec 2013 18:48:57 +0000 (10:48 -0800)
committerSage Weil <sage@inktank.com>
Tue, 3 Dec 2013 18:48:57 +0000 (10:48 -0800)
feed osd info about os, kernel, memory, arch to the mons

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
Reviewed-by: Loic Dachary <loic@dachary.org>
1  2 
src/mon/MonCommands.h
src/mon/OSDMonitor.cc
src/osd/OSD.cc
src/osd/OSD.h
src/test/pybind/test_ceph_argparse.py

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