[nrpe/f12/master: 6/6] Merge branch 'master' into f12/master
Peter Lemenkov
peter at fedoraproject.org
Sat Sep 11 20:15:20 UTC 2010
commit 0bb846f6527c13a3c45725aa9e5ff46009e1401b
Merge: fde23eb bb80ebd
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun Sep 12 00:15:03 2010 +0400
Merge branch 'master' into f12/master
Conflicts:
.gitignore
nrpe.spec
nrpe.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc nrpe.spec
index 4642204,a404093..aa25477
--- a/nrpe.spec
+++ b/nrpe.spec
@@@ -130,6 -130,9 +130,9 @@@ f
%doc Changelog LEGAL README
%changelog
+ * Sat Sep 11 2010 Peter Lemenkov <lemenkov at gmail.com> - 2.12-14
-- Issue with SELinux was resolved (see rhbz #565220).
++- Issue with SELinux resolved (see rhbz #565220).
+
* Fri Jun 18 2010 Peter Lemenkov <lemenkov at gmail.com> - 2.12-13
- Init-script enhancements (see rhbz #247001, #567141 and #575544)
More information about the scm-commits
mailing list