From: Nathan Cutler <presnypreklad@gmail.com>
Date: Thu, 10 Sep 2015 09:46:41 +0000 (+0200)
Subject: Merge pull request #5200 from SUSE/wip-12289-firefly
X-Git-Tag: v0.80.11~39
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5935%2Fhead;p=ceph.git

Merge pull request #5200 from SUSE/wip-12289-firefly

mon: scrub error (osdmap encoding mismatch?) upgrading from 0.80 to ~0.80.2

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

4b0889567d7fe28ef6976f8dbb0d329b03200986