From: Sage Weil <sage@redhat.com>
Date: Mon, 24 Jun 2019 18:15:16 +0000 (-0500)
Subject: Merge PR #28624 into master
X-Git-Tag: v15.1.0~2382
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fe4c5fcb26d7f591dcedd15da33f0becf1d55762;p=ceph.git

Merge PR #28624 into master

* refs/pull/28624/head:
	mgr/zabbix: encode string for Python 3 compatibility

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

fe4c5fcb26d7f591dcedd15da33f0becf1d55762