Merge branch 'master' into m-p
Conflicts: debian/changelog debian/patches/00list
This commit is contained in:
commit
3662a51778
3 changed files with 148 additions and 0 deletions
9
debian/changelog
vendored
9
debian/changelog
vendored
|
@ -4,6 +4,15 @@ monitoring-plugins (1.5+git20140123-2~1) UNRELEASED; urgency=medium
|
|||
|
||||
-- Jan Wagner <waja@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@cyconet.org> Mon, 17 Feb 2014 12:42:06 +0100
|
||||
|
||||
nagios-plugins (1.5-2) unstable; urgency=medium
|
||||
|
||||
* Update Licensing text from upstream README
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue