Merge remote-tracking branch 'gh/jewel'

2025-03-11 02:39:05 +00:00 · 2016-02-08 17:26:32 -05:00 · 2016-02-08 17:26:32 -05:00 · 117041ef47
commit 117041ef47
parent aa207c2981 e96a3fe0b9
3 changed files with 4 additions and 0 deletions
--- a/suites/upgrade/hammer-x/stress-split/0-cluster/+
+++ b/suites/upgrade/hammer-x/stress-split/0-cluster/+
--- a/suites/upgrade/hammer-x/stress-split/0-cluster/openstack.yaml
+++ b/suites/upgrade/hammer-x/stress-split/0-cluster/openstack.yaml
@ -0,0 +1,3 @@
+openstack:
+  - machine:
+      disk: 40 # GB
--- a/suites/upgrade/hammer-x/tiering/0-cluster/start.yaml
+++ b/suites/upgrade/hammer-x/tiering/0-cluster/start.yaml
@ -14,6 +14,7 @@ overrides:
    - scrub mismatch
    - ScrubResult
    - failed to encode map
+    - wrongly marked me down
    conf:
      mon:
        mon warn on legacy crush tunables: false