From: Kefu Chai <tchaikov@gmail.com>
Date: Wed, 16 Aug 2017 11:44:36 +0000 (+0800)
Subject: Merge pull request #16967 from liewegas/wip-upgrade-health
X-Git-Tag: v13.0.0~96
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=17d6e96a6feba7363fdab84d49af457c62450e11;p=ceph.git

Merge pull request #16967 from liewegas/wip-upgrade-health

mon: fix legacy health checks in 'ceph status' during upgrade; fix jewel-x upgrade combo

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

17d6e96a6feba7363fdab84d49af457c62450e11
diff --cc src/mon/Monitor.cc
index 417688c026bc,c136885749dc..3f1f56036e9e
mode 100755,100644..100755
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc