From: Yuri Weinstein <yuri.weinstein@gmail.com>
Date: Sat, 28 May 2016 15:50:09 +0000 (-0700)
Subject: Merge pull request #9222 from xiexingguo/xxg-wip-scrubq-assert
X-Git-Tag: v11.0.0~383
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d6b5a4d44f0da20ec61a36e4b2ade9c6974fd099;p=ceph.git

Merge pull request #9222 from xiexingguo/xxg-wip-scrubq-assert

mon: fix assert triggerred by the deprecated "scrubq" state

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

d6b5a4d44f0da20ec61a36e4b2ade9c6974fd099