[Pkg-nagios-changes] [pkg-monitoring-plugins] 24/51: Merge branch 'master' into m-p

[Jan Wagner]

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

waja pushed a commit to branch master
in repository pkg-monitoring-plugins.

commit 3662a51778ea9ee1836abee1d28832070c2ccdb6
Merge: d4579f1 0ef43fe
Author: Jan Wagner <waja at cyconet.org>
Date:   Fri Feb 21 19:40:48 2014 +0100

    Merge branch 'master' into m-p
    
    Conflicts:
    	debian/changelog
    	debian/patches/00list

 debian/changelog                                   |   9 ++
 debian/patches/00list                              |   1 +
 debian/patches/13_check_proc_parent_process.dpatch | 138 +++++++++++++++++++++
 3 files changed, 148 insertions(+)

diff --cc debian/changelog
index 7018c60,42e1882..e18007a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,18 @@@
 +monitoring-plugins (1.5+git20140123-2~1) UNRELEASED; urgency=medium
 +
 +  * New upstream git snapshot
 +
 + -- Jan Wagner <waja at cyconet.org>  Thu, 23 Jan 2014 01:50:59 +0100
 +
+ nagios-plugins (1.5-3) unstable; urgency=medium
+ 
+   * [38d8f67] Fixing latest changelog timestamp
+   * [7091aae] check_ssh: Drop 12_check_ssh_read_socket.dpatch
+     (Closes: #734811), this seems to make more touble in the wild as fixing
+     #739254, Thanks Jim Barber
+ 
+  -- Jan Wagner <waja at cyconet.org>  Mon, 17 Feb 2014 12:42:06 +0100
+ 
  nagios-plugins (1.5-2) unstable; urgency=medium
  
    * Update Licensing text from upstream README
diff --cc debian/patches/00list
index 2e7a453,463ec3a..6ba78e1
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@@ -1,3 -1,5 +1,4 @@@
  02_check_icmp_links.dpatch
  03_configure.in_remove_perlmods.dpatch
  # commited upstream
 -11_check_http_arguments.dpatch
+ 13_check_proc_parent_process.dpatch

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