From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 28 Mar 2018 22:25:06 +0000 (-0700)
Subject: Merge pull request #20781 from wido/luminous-zabbix
X-Git-Tag: v12.2.5~94
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=daf1255f4a0329940d4d8c069fda488941a412b2;p=ceph.git

Merge pull request #20781 from wido/luminous-zabbix

mgr/zabbix: Backports to Luminous

Reviewed-by: John Spray <john.spray@redhat.com>
---

daf1255f4a0329940d4d8c069fda488941a412b2