[icinga-checkins] icinga.org: icinga-core/r1.4: bump correctly to 1.4.2

git at icinga.org git at icinga.org
Sat Jun 25 17:47:50 CEST 2011


Module: icinga-core
Branch: r1.4
Commit: fe3a11ce041b48a6278bdac49fc59acf531faeef
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=fe3a11ce041b48a6278bdac49fc59acf531faeef

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Jun 25 17:47:37 2011 +0200

bump correctly to 1.4.2

---

 icinga.spec |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/icinga.spec b/icinga.spec
index ca0e360..85b3bd2 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -11,9 +11,9 @@
 
 Summary: Open Source host, service and network monitoring program
 Name: icinga
-Version: 1.4.1
+Version: 1.4.2
 Release: 1%{?dist}
-License: GPLv2+
+License: GPLv2
 Group: Applications/System
 URL: http://www.icinga.org/
 
@@ -243,7 +243,6 @@ fi
 
 
 %changelog
-<<<<<<< HEAD
 * Mon Jun 20 2011 Michael Friedrich <michael.friedrich at univie.ac.at> - 1.4.2-1
 - update to 1.4.2, mv idoutils.cfg-sample
 





More information about the icinga-checkins mailing list