From: Kefu Chai <kchai@redhat.com>
Date: Fri, 11 Oct 2019 13:04:53 +0000 (+0800)
Subject: Merge pull request #26146 from snijhuis/master
X-Git-Tag: v15.1.0~1278
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44a32df3911105cb9f65fbe1a779894c9097cd9b;p=ceph.git

Merge pull request #26146 from snijhuis/master

mgr: zabbix triggers never triggered due to wrong trigger function

Reviewed-by: Wido den Hollander <wido@42on.com>
Reviewed-by: Dmitriy Rabotjagov <noonedeadpunk@ya.ru>
---

44a32df3911105cb9f65fbe1a779894c9097cd9b