Commit 7e348925 authored by Noah Hilverling's avatar Noah Hilverling
Browse files

Merge branch 'master' into 2.12

parents 1aa4e0f4 d7a737e0
Pipeline #10317 failed with stages
in 55 minutes and 11 seconds
...@@ -220,47 +220,72 @@ upload/ubuntu/focal: ...@@ -220,47 +220,72 @@ upload/ubuntu/focal:
- ubuntu/focal:x86_64 - ubuntu/focal:x86_64
- ubuntu/focal - ubuntu/focal
# disco # eoan
ubuntu/disco: ubuntu/eoan:
<<: *source <<: *source
variables: variables:
DOCKER_IMAGE: ubuntu/disco DOCKER_IMAGE: ubuntu/eoan
ubuntu/disco:x86_64: ubuntu/eoan:x86_64:
<<: *binary <<: *binary
variables: variables:
DOCKER_IMAGE: ubuntu/disco DOCKER_IMAGE: ubuntu/eoan
dependencies: dependencies:
- ubuntu/disco - ubuntu/eoan
test/ubuntu/disco:x86_64: test/ubuntu/eoan:x86_64:
<<: *test <<: *test
variables: variables:
DOCKER_IMAGE: ubuntu/disco DOCKER_IMAGE: ubuntu/eoan
dependencies: dependencies:
- ubuntu/disco - ubuntu/eoan
ubuntu/disco:x86: ubuntu/eoan:x86:
<<: *binary <<: *binary
variables: variables:
DOCKER_IMAGE: ubuntu/disco:x86 DOCKER_IMAGE: ubuntu/eoan:x86
dependencies: dependencies:
- ubuntu/disco - ubuntu/eoan
test/ubuntu/disco:x86: test/ubuntu/eoan:x86:
<<: *test <<: *test
variables: variables:
DOCKER_IMAGE: ubuntu/disco:x86 DOCKER_IMAGE: ubuntu/eoan:x86
dependencies: dependencies:
- ubuntu/disco:x86 - ubuntu/eoan:x86
- ubuntu/disco:x86_64 - ubuntu/eoan:x86_64
upload/ubuntu/disco: upload/ubuntu/eoan:
<<: *upload <<: *upload
dependencies: dependencies:
- ubuntu/disco:x86 - ubuntu/eoan:x86
- ubuntu/disco:x86_64 - ubuntu/eoan:x86_64
- ubuntu/disco - ubuntu/eoan
ubuntu/focal:
<<: *source
variables:
DOCKER_IMAGE: ubuntu/focal
ubuntu/focal:x86_64:
<<: *binary
variables:
DOCKER_IMAGE: ubuntu/focal
dependencies:
- ubuntu/focal
test/ubuntu/focal:x86_64:
<<: *test
variables:
DOCKER_IMAGE: ubuntu/focal
dependencies:
- ubuntu/focal
upload/ubuntu/focal:
<<: *upload
dependencies:
- ubuntu/focal:x86_64
- ubuntu/focal
# bionic # bionic
ubuntu/bionic: ubuntu/bionic:
......
icinga2 (2.11.4-1) icinga; urgency=medium
* Release 2.11.4-1
-- Noah Hilverling <noah.hilverling@icinga.com> Thu, 18 Jun 2020 09:44:31 +0200
icinga2 (2.12.0~rc1-1) icinga; urgency=medium icinga2 (2.12.0~rc1-1) icinga; urgency=medium
* Prepare pre-release for 2.12 * Prepare pre-release for 2.12
-- Johannes Meyer <johannes.meyer@icinga.com> Fri, 13 Mar 2020 14:27:38 +0200 -- Johannes Meyer <johannes.meyer@icinga.com> Fri, 13 Mar 2020 14:27:38 +0200
icinga2 (2.11.3-1) icinga; urgency=medium
* Release 2.11.3-1
-- Henrik Triem <henrik.triem@icinga.com> Mon, 02 Mar 2020 15:40:31 +0200
icinga2 (2.11.2-1) icinga; urgency=medium icinga2 (2.11.2-1) icinga; urgency=medium
* Release 2.11.2-1 * Release 2.11.2-1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment