Merging upstream version 1.11.0+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 42 insertions, 15 deletions

diff --git a/.gitignore b/.gitignore
index cd69d7ea5..c3f327b37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,15 @@
 .deps
 .libs
+.dirstamp
+.project
+.pydevproject
 
 *.o
+*.a
 config.h.in
 Makefile.in
 *~
+.*.swp
 *.old
 *.log
 *.pyc
@@ -25,12 +30,20 @@ ltmain.sh
 missing
 stamp-h1
 netdata.spec
+sha256sums.txt
 
 # netdata binaries
 netdata
+!netdata/
+
 apps.plugin
+!apps.plugin/
+
 freeipmi.plugin
+!freeipmi.plugin/
+
 cgroup-network
+!cgroup-network/
 
 # netdata makeself archives
 *.tar.*
@@ -52,15 +65,15 @@ netdata-coverity-analysis.tgz
 .settings/
 README
 TODO.md
-conf.d/netdata.conf
-src/TODO.txt
+netdata.conf
+TODO.txt
 
-web/chart-info/
-web/control.html
-web/datasource.css
-web/gadget.xml
-web/index_new.html
-web/version.txt
+web/gui/chart-info/
+web/gui/control.html
+web/gui/datasource.css
+web/gui/gadget.xml
+web/gui/index_new.html
+web/gui/version.txt
 
 # related to karma/javascript/node
 /node_modules/
@@ -71,7 +84,17 @@ system/netdata-openrc
 system/netdata-init-d
 system/netdata.logrotate
 system/netdata.service
+system/netdata.plist
 system/netdata-freebsd
+system/edit-config
+
+health/notifications/alarm-notify.sh
+collectors/cgroups.plugin/cgroup-name.sh
+collectors/tc.plugin/tc-qos-helper.sh
+collectors/charts.d.plugin/charts.d.plugin
+collectors/node.d.plugin/node.d.plugin
+collectors/python.d.plugin/python.d.plugin
+collectors/fping.plugin/fping.plugin
 
 # installer generated files
 netdata-uninstaller.sh
@@ -79,6 +102,7 @@ netdata-updater.sh
 
 # cmake files
 cmake-build-debug/
+cmake-build-release/
 CMakeCache.txt
 CMakeFiles/
 cmake_install.cmake
@@ -97,16 +121,19 @@ diagrams/*.atxt
 diagrams/plantuml.jar
 
 # cppcheck
-src/cppcheck-build/
+cppcheck-build/
+
+venv/
 
 # debugging / profiling
 makeself/debug/
-profile/benchmark-dictionary
-profile/benchmark-registry
-profile/test-eval
-profile/benchmark-line-parsing
-profile/benchmark-procfile-parser
-profile/statsd-stress
+tests/profile/benchmark-dictionary
+tests/profile/benchmark-registry
+tests/profile/test-eval
+tests/profile/benchmark-line-parsing
+tests/profile/benchmark-procfile-parser
+tests/profile/benchmark-value-pairs
+tests/profile/statsd-stress
 oprofile_data/
 vgcore.*
 callgrind.out.*