]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #20781 from wido/luminous-zabbix
authorYuri Weinstein <yweinste@redhat.com>
Wed, 28 Mar 2018 22:25:06 +0000 (15:25 -0700)
committerGitHub <noreply@github.com>
Wed, 28 Mar 2018 22:25:06 +0000 (15:25 -0700)
mgr/zabbix: Backports to Luminous

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

Trivial merge