]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #16025 from liewegas/wip-19964
authorSage Weil <sage@newdream.net>
Sat, 8 Jul 2017 14:01:10 +0000 (09:01 -0500)
committerGitHub <noreply@github.com>
Sat, 8 Jul 2017 14:01:10 +0000 (09:01 -0500)
mon: do crushtool test with fork and timeout, but w/o exec of crushtool

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
1  2 
src/common/config_opts.h
src/mon/OSDMonitor.cc

Simple merge
Simple merge