From ca540a730c0b880922e86074f994a95b8d413bea Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sun, 13 Oct 2019 10:37:32 +0200
Subject: Merging upstream version 1.18.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 1222d46ea..afb0c67bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,6 +59,9 @@ xenstat.plugin
 perf.plugin
 !perf.plugin/
 
+slabinfo.plugin
+!slabinfo.plugin/
+
 cgroup-network
 !cgroup-network/
 
@@ -167,6 +170,7 @@ sitespeed-result/
 tests/acls/acl.sh
 tests/urls/request.sh
 tests/alarm_repetition/alarm.sh
+tests/template_dimension/template_dim.sh
 
 # tests and temp files
 python.d/python-modules-installer.sh
-- 
cgit v1.2.3