commit 7101e1c21e23fcc09c98556e3433eb8f0040f470 Merge: 8bce63d d64e247 Author: Kevin Fenzi kevin@scrye.com Date: Fri May 31 14:28:03 2013 -0600

Merge remote-tracking branch 'origin/master' into el5

.gitignore | 1 + ...drestart-try-restart-target-to-initscript.patch | 37 +++++++++ nrpe.service | 2 +- nrpe.spec | 82 ++++++++++++-------- sources | 2 +- 5 files changed, 88 insertions(+), 36 deletions(-) ---