From: Sage Weil <sage@redhat.com>
Date: Sun, 18 Nov 2018 13:04:40 +0000 (-0600)
Subject: Merge PR #20665 into master
X-Git-Tag: v14.1.0~891
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2d5b4f917cbef2e0815be288c800a73961d90e9f;p=ceph-ci.git

Merge PR #20665 into master

* refs/pull/20665/head:
	mgr/balancer: add crush_compat_metrics param

Reviewed-by: Sage Weil <sage@redhat.com>
---

2d5b4f917cbef2e0815be288c800a73961d90e9f
diff --cc src/pybind/mgr/balancer/module.py
index 66315152019,57190f549c5..3d51aad7b95
--- a/src/pybind/mgr/balancer/module.py
+++ b/src/pybind/mgr/balancer/module.py
@@@ -205,8 -206,10 +205,9 @@@ class Module(MgrModule)
              {'name': 'active'},
              {'name': 'begin_time'},
              {'name': 'crush_compat_max_iterations'},
+             {'name': 'crush_compat_metrics'},
              {'name': 'crush_compat_step'},
              {'name': 'end_time'},
 -            {'name': 'max_misplaced'},
              {'name': 'min_score'},
              {'name': 'mode'},
              {'name': 'sleep_interval'},