From: Sage Weil <sage@redhat.com>
Date: Thu, 21 Feb 2019 03:36:58 +0000 (-0600)
Subject: Merge PR #26511 into master
X-Git-Tag: v14.1.0~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=32f36a9a7229ae7daff2298c5a532f909a43299b;p=ceph.git

Merge PR #26511 into master

* refs/pull/26511/head:
	mgr: Selftest fails, dashboard/server_port not string

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
---

32f36a9a7229ae7daff2298c5a532f909a43299b