Merge branch '2.11'

.gitlab-ci.yml

@@ -5,7 +5,9 @@ stages:
 
 variables:
   DOCKER_IMAGE_BASE: registry.icinga.com/build-docker
-  ICINGA_BUILD_TYPE: snapshot
+  ICINGA_BUILD_TYPE: release
+  #ICINGA_BUILD_RELEASE_TYPE: 
+  #ICINGA_BUILD_TYPE:
   #ICINGA_BUILD_UPSTREAM_BRANCH:
 
 .build: &build

icinga2.spec

@@ -97,7 +97,11 @@ License:        GPLv2+
 %endif # suse
 Group:          System/Monitoring
 Name:           icinga2
+<<<<<<< HEAD
 Version: 2.11.0
+=======
+Version:        2.11.2
+>>>>>>> 2.11
 Release:        %{revision}%{?dist}
 Url:            https://www.icinga.com/
 Source:         https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz
@@ -832,9 +836,18 @@ fi
 %{_datadir}/nano/%{name}.nanorc
 
 %changelog
+* Thu Oct 24 2019 Michael Friedrich <michael.friedrich@icinga.com> 2.11.2-1
+- Update to 2.11.2
+
+* Thu Oct 17 2019 Michael Friedrich <michael.friedrich@icinga.com> 2.11.1-1
+- Update to 2.11.1
+
 * Thu Sep 19 2019 Michael Friedrich <michael.friedrich@icinga.com> 2.11.0-1
 - Update to 2.11.0
 
+* Thu Jul 25 2019 Markus Frosch <markus.frosch@icinga.com> 2.11.0-0.rc1.1
+- Prepare pre-release 2.11.0-rc1
+
 * Tue Mar 19 2019 Michael Friedrich <michael.friedrich@icinga.com> 2.10.4-1
 - Update to 2.10.4