From: Sage Weil <sage@newdream.net>
Date: Sun, 23 Apr 2017 20:47:28 +0000 (-0500)
Subject: Merge pull request #14442 from liewegas/wip-midkraken-upgrade
X-Git-Tag: v12.0.3~283
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d368d2c8544247a4aed9c71c74e77b0c6bbfb22;p=ceph.git

Merge pull request #14442 from liewegas/wip-midkraken-upgrade

mon/OSDMonitor: tolerate upgrade from post-kraken dev cluster

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

0d368d2c8544247a4aed9c71c74e77b0c6bbfb22