Merge branch 'master' into 2.12

.gitlab-ci.yml

@@ -220,47 +220,72 @@ upload/ubuntu/focal:
     - ubuntu/focal:x86_64
     - ubuntu/focal
 
-# disco
-ubuntu/disco:
+# eoan
+ubuntu/eoan:
   <<: *source
   variables:
-    DOCKER_IMAGE: ubuntu/disco
+    DOCKER_IMAGE: ubuntu/eoan
 
-ubuntu/disco:x86_64:
+ubuntu/eoan:x86_64:
   <<: *binary
   variables:
-    DOCKER_IMAGE: ubuntu/disco
+    DOCKER_IMAGE: ubuntu/eoan
   dependencies:
-    - ubuntu/disco
+    - ubuntu/eoan
 
-test/ubuntu/disco:x86_64:
+test/ubuntu/eoan:x86_64:
   <<: *test
   variables:
-    DOCKER_IMAGE: ubuntu/disco
+    DOCKER_IMAGE: ubuntu/eoan
   dependencies:
-    - ubuntu/disco
+    - ubuntu/eoan
 
-ubuntu/disco:x86:
+ubuntu/eoan:x86:
   <<: *binary
   variables:
-    DOCKER_IMAGE: ubuntu/disco:x86
+    DOCKER_IMAGE: ubuntu/eoan:x86
   dependencies:
-    - ubuntu/disco
+    - ubuntu/eoan
 
-test/ubuntu/disco:x86:
+test/ubuntu/eoan:x86:
   <<: *test
   variables:
-    DOCKER_IMAGE: ubuntu/disco:x86
+    DOCKER_IMAGE: ubuntu/eoan:x86
   dependencies:
-    - ubuntu/disco:x86
-    - ubuntu/disco:x86_64
+    - ubuntu/eoan:x86
+    - ubuntu/eoan:x86_64
 
-upload/ubuntu/disco:
+upload/ubuntu/eoan:
   <<: *upload
   dependencies:
-    - ubuntu/disco:x86
-    - ubuntu/disco:x86_64
-    - ubuntu/disco
+    - ubuntu/eoan:x86
+    - ubuntu/eoan:x86_64
+    - 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
 ubuntu/bionic:

debian/changelog

+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
 
   * Prepare pre-release for 2.12
 
  -- 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
 
   * Release 2.11.2-1