Merge remote-tracking branch 'upstream/master'

2a477c53 · Markus Frosch · 34655986 · ad0e26de · 2a477c53 · 2a477c53
Commit 2a477c53 authored Jul 18, 2019 by Markus Frosch
--- a/jessie/debian/.gitignore
+++ b/jessie/debian/.gitignore
--- a/jessie/debian/NEWS
+++ b/jessie/debian/NEWS
--- a/jessie/debian/TODO
+++ b/jessie/debian/TODO
--- a/stretch/debian/changelog
+++ b/stretch/debian/changelog
--- a/jessie/debian/compat
+++ b/jessie/debian/compat
--- a/jessie/debian/config/apt.conf
+++ b/jessie/debian/config/apt.conf
--- a/jessie/debian/config/kernel.conf
+++ b/jessie/debian/config/kernel.conf
--- a/stretch/debian/control
+++ b/stretch/debian/control
--- a/jessie/debian/copyright
+++ b/jessie/debian/copyright
--- a/jessie/debian/docs
+++ b/jessie/debian/docs
--- a/jessie/debian/gbp.conf
+++ b/jessie/debian/gbp.conf
--- a/jessie/debian/icinga2-bin.install
+++ b/jessie/debian/icinga2-bin.install
--- a/jessie/debian/icinga2-bin.lintian-overrides
+++ b/jessie/debian/icinga2-bin.lintian-overrides
--- a/jessie/debian/icinga2-bin.postinst
+++ b/jessie/debian/icinga2-bin.postinst
--- a/jessie/debian/icinga2-bin.postrm
+++ b/jessie/debian/icinga2-bin.postrm
--- a/jessie/debian/icinga2-common.bash-completion
+++ b/jessie/debian/icinga2-common.bash-completion
--- a/jessie/debian/icinga2-common.dirs
+++ b/jessie/debian/icinga2-common.dirs
--- a/jessie/debian/icinga2-common.icinga2.default
+++ b/jessie/debian/icinga2-common.icinga2.default
--- a/jessie/debian/icinga2-common.icinga2.init
+++ b/jessie/debian/icinga2-common.icinga2.init
--- a/stretch/debian/icinga2-common.install
+++ b/stretch/debian/icinga2-common.install