Merge pull request #1185 from ceph/wip-crush

crush: "vary_r" tunable

Reviewed-by: Loic Dachary <loic@dachary.org>

diff --cc src/mon/MonCommands.h
Simple merge

diff --cc src/mon/OSDMonitor.cc
Simple merge

diff --cc src/test/pybind/test_ceph_argparse.py
Simple merge