[Pkg-nagios-changes] [pkg-nagios-plugins-contrib] 01/01: Merge branch 'master' into jessie-backports

[Bernd Zeimetz]

This is an automated email from the git hooks/post-receive script.

bzed pushed a commit to branch jessie-backports
in repository pkg-nagios-plugins-contrib.

commit 6f3d87b749e59d61a1b6ad32b693ef19f3646ab4
Merge: 232b113 54c9557
Author: Bernd Zeimetz <bernd at bzed.de>
Date:   Tue Jan 3 17:33:15 2017 +0100

    Merge branch 'master' into jessie-backports

 .travis.yml          | 2 +-
 debian/tests/control | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --cc .travis.yml
index b91219f,98dda3d..f25977a
--- a/.travis.yml
+++ b/.travis.yml
@@@ -1,7 -1,9 +1,7 @@@
  sudo: required
  
  env:
-   - TRAVIS_DEBIAN_DISTRIBUTION=jessie TRAVIS_DEBIAN_BACKPORTS=true   TRAVIS_DEBIAN_MIRROR="http://httpredir.debian.org/debian/"
 -  - TRAVIS_DEBIAN_DISTRIBUTION=unstable TRAVIS_DEBIAN_SECURITY_UPDATES=false
 -  - TRAVIS_DEBIAN_DISTRIBUTION=testing  
 -  - TRAVIS_DEBIAN_DISTRIBUTION=stable   
++  - TRAVIS_DEBIAN_DISTRIBUTION=jessie TRAVIS_DEBIAN_BACKPORTS=true
  
  services:
    - docker

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins-contrib.git