Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Mon, 1 Aug 2011 21:05:10 +0000 (23:05 +0200)
committerPeter Palfrader <peter@palfrader.org>
Mon, 1 Aug 2011 21:05:10 +0000 (23:05 +0200)
commit7a49edcf911c59ad44a090acb7a873c86ada83b2
tree9d10b90391a0ef97b80a5cdb121d3d2525eb9439
parentb56347e8629ddb61729f7d63d8f6a6d5109401af
parent611376368dc102b2b4641e187077cfadaae76c9e
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  we want to monitor pglistener, take 2
  we want to monitor pglistener
config/nagios-master.cfg