Prepare 9.2.0-rc.6

LINBIT · Jul 6, 2022 · abf3d0c · abf3d0c
1 parent 807e457
commit abf3d0c
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -2,6 +2,25 @@ Latest:
 ------
  For even more detail, use "git log" or visit https://github.com/LINBIT/drbd/commits/master.
 
+9.2.0-rc.6 (api:genl2/proto:110-121/transport:18)
+--------
+ * fixes to the new way of coordinating resync and application IO
+ * merge discard requests during resync on a resync target node;
+   This can speed up the resync progress by multiple orders of magnitude
+ * Merged changes from the 9.1.8 release
+  - restore protocol compatibility with drbd-8.4
+  - detect peers that died silently when starting a two-phase-commit
+  - correctly abort two-phase-commits when a connection breaks between
+    phases 1 and 2
+  - allow re-connect to a node that was forced into secondary role and
+    where an opener is still present from the last time it was primary
+  - fix a race condition that allowed to configure two peers with the
+    same node id
+  - ensure that an open() call fails within the auto-promote timeout
+    if it can not succeed
+  - build fixes for RHEL9
+  - following upstream changes to DRBD up to Linux 5.17 and updated compat
+
 9.2.0-rc.4 (api:genl2/proto:110-121/transport:18)
 --------
  * Merged fixes from the 9.1.6 release

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+drbd (9.2.0~rc.6-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Philipp Reisner <philipp.reisner@linbit.com>  Wed,  6 Jul 2022 22:49:36 +0200
+
 drbd (9.2.0~rc.4-1) unstable; urgency=medium
 
   * New upstream release

diff --git a/docker/Dockerfile.rhel7 b/docker/Dockerfile.rhel7
@@ -1,7 +1,7 @@
 FROM registry.access.redhat.com/ubi7/ubi
 MAINTAINER Roland Kammerer <roland.kammerer@linbit.com>
 
-ENV DRBD_VERSION 9.2.0-rc.4
+ENV DRBD_VERSION 9.2.0-rc.6
 
 ARG release=1
 LABEL name="DRBD Kernel module load container" \

diff --git a/docker/Dockerfile.rhel8 b/docker/Dockerfile.rhel8
@@ -8,7 +8,7 @@ RUN dnf install -y 'dnf-command(download)' && cd /pkgs && dnf download elfutils-
 FROM registry.access.redhat.com/ubi8/ubi
 MAINTAINER Roland Kammerer <roland.kammerer@linbit.com>
 
-ENV DRBD_VERSION 9.2.0-rc.4
+ENV DRBD_VERSION 9.2.0-rc.6
 
 ARG release=1
 LABEL name="DRBD Kernel module load container" \

diff --git a/docker/Dockerfile.rhel9 b/docker/Dockerfile.rhel9
@@ -8,7 +8,7 @@ RUN dnf install -y 'dnf-command(download)' && cd /pkgs && dnf download elfutils-
 FROM registry.access.redhat.com/ubi9/ubi
 MAINTAINER Roland Kammerer <roland.kammerer@linbit.com>
 
-ENV DRBD_VERSION 9.1.7
+ENV DRBD_VERSION 9.2.0-rc.6
 
 ARG release=1
 LABEL name="DRBD Kernel module load container" \

diff --git a/drbd-kernel.spec b/drbd-kernel.spec
@@ -1,6 +1,6 @@
 Name: drbd-kernel
 Summary: Kernel driver for DRBD
-Version: 9.2.0~rc.4
+Version: 9.2.0~rc.6
 Release: 1
 
 # always require a suitable userland
@@ -132,6 +132,9 @@ install -D misc/SECURE-BOOT-KEY-linbit.com.der $RPM_BUILD_ROOT/etc/pki/linbit/SE
 rm -rf %{buildroot}
 
 %changelog
+* Wed Jul  6 2022 Philipp Reisner <phil@linbit.com> - 9.2.0~rc.6
+-  New upstream release.
+
 * Mon Feb 14 2022 Philipp Reisner <phil@linbit.com> - 9.2.0~rc.4
 -  New upstream release.
 

diff --git a/drbd/linux/drbd_config.h b/drbd/linux/drbd_config.h
@@ -20,7 +20,7 @@ extern const char *drbd_buildtag(void);
 
 /* End of external module for 2.6.33 stuff */
 
-#define REL_VERSION "9.2.0-rc.4"
+#define REL_VERSION "9.2.0-rc.6"
 #define PRO_VERSION_MIN 86
 #define PRO_VERSION_MAX 121