Merge branch '2.11'

This commit is contained in:
Henrik Triem 2020-06-04 15:04:40 +02:00
commit cd6d8f9051
2 changed files with 6 additions and 2 deletions

View File

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

View File

@ -97,7 +97,7 @@ License: GPLv2+
%endif # suse %endif # suse
Group: System/Monitoring Group: System/Monitoring
Name: icinga2 Name: icinga2
Version: 2.11.2 Version: 2.11.3
Release: %{revision}%{?dist} Release: %{revision}%{?dist}
Url: https://www.icinga.com/ Url: https://www.icinga.com/
Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz
@ -832,6 +832,9 @@ fi
%{_datadir}/nano/%{name}.nanorc %{_datadir}/nano/%{name}.nanorc
%changelog %changelog
* Mon Mar 02 2020 Henrik Triem <henrik.triem@icinga.com> 2.11.3-1
- Update to 2.11.3
* Thu Oct 24 2019 Michael Friedrich <michael.friedrich@icinga.com> 2.11.2-1 * Thu Oct 24 2019 Michael Friedrich <michael.friedrich@icinga.com> 2.11.2-1
- Update to 2.11.2 - Update to 2.11.2