From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 24 Jul 2015 16:59:11 +0000 (-0700)
Subject: Fixes #12460
X-Git-Tag: v10.2.6~165^2^2~430^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb71120b37ec6238daf53561d9e6facdb438feb5;p=ceph.git

Fixes #12460

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
---

diff --git a/suites/upgrade/hammer-x/parallel/0-cluster/start.yaml b/suites/upgrade/hammer-x/parallel/0-cluster/start.yaml
index 30aac173ce8f..6ffb8d506e29 100644
--- a/suites/upgrade/hammer-x/parallel/0-cluster/start.yaml
+++ b/suites/upgrade/hammer-x/parallel/0-cluster/start.yaml
@@ -14,6 +14,7 @@ overrides:
     log-whitelist:
     - scrub mismatch
     - ScrubResult
+    - failed to encode map
     conf:
       mon:
         mon warn on legacy crush tunables: false