[nrpe/el5: 3/3] Merge branch 'master' into el5

[Peter Lemenkov]

commit e957621d6f2ed5717c97a2f21247babaf9a501b8
Merge: 7101e1c c51978e
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Wed Oct 16 19:11:04 2013 +0400

    Merge branch 'master' into el5

 ...0001-Add-reload-target-to-the-init-script.patch |   10 ++--
 ...tra-configuration-from-etc-sysconfig-nrpe.patch |   10 ++--
 ...-0003-Include-etc-npre.d-config-directory.patch |   14 ++--
 nrpe-0004-Fix-initscript-return-codes.patch        |   10 ++--
 nrpe-0005-Do-not-start-by-default.patch            |   10 ++--
 nrpe-0006-Relocate-pid-file.patch                  |   12 ++--
 ...drestart-try-restart-target-to-initscript.patch |    8 +-
 ...to-override-all-defaults-even-command-def.patch |   45 ++++++++++++
 nrpe.spec                                          |   72 +++++++++++++-------
 9 files changed, 128 insertions(+), 63 deletions(-)
---