]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #20665 into master
authorSage Weil <sage@redhat.com>
Sun, 18 Nov 2018 13:04:40 +0000 (07:04 -0600)
committerSage Weil <sage@redhat.com>
Sun, 18 Nov 2018 13:04:40 +0000 (07:04 -0600)
* refs/pull/20665/head:
mgr/balancer: add crush_compat_metrics param

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/pybind/mgr/balancer/module.py

index 66315152019964edf8466a45d9448dc9fc051857,57190f549c569a3380b1d9d44fb801ff56c59fc7..3d51aad7b954f475784d7043bfaa4cac88bca761
@@@ -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'},