From: Sage Weil <sage@redhat.com>
Date: Thu, 3 Jan 2019 13:23:57 +0000 (-0600)
Subject: Merge PR #25673 into master
X-Git-Tag: v14.1.0~512
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50687a29719c403cce6daae9b435f25c66aee730;p=ceph.git

Merge PR #25673 into master

* refs/pull/25673/head:
	mon/Monitor: quorum_age in JSON output as int, not string

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

50687a29719c403cce6daae9b435f25c66aee730