From bfc1691453a36de688e013239ce5c586263933fa Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Mon, 14 Nov 2022 13:59:18 +0100 Subject: [PATCH] Prepare drbd-9.1.12 --- ChangeLog | 2 +- debian/changelog | 4 ++-- docker/Dockerfile.rhel7 | 2 +- docker/Dockerfile.rhel8 | 2 +- docker/Dockerfile.rhel9 | 2 +- drbd-kernel.spec | 4 ++-- drbd/linux/drbd_config.h | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1aa42c0d0..44f36611f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,7 @@ Latest: ------ For even more detail, use "git log" or visit https://github.com/LINBIT/drbd/commits/master. -9.1.12-rc.1 (api:genl2/proto:110-121/transport:17) +9.1.12 (api:genl2/proto:110-121/transport:17) -------- * fix a race that could result in connection attempts getting aborted with the message "sock_recvmsg returned -11" diff --git a/debian/changelog b/debian/changelog index 156218bdc..83b55e303 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -drbd (9.1.12~rc.1-1) unstable; urgency=medium +drbd (9.1.12-1) unstable; urgency=medium * New upstream release - -- Philipp Reisner Mon, 7 Nov 2022 16:56:28 +0200 + -- Philipp Reisner Mon, 14 Nov 2022 13:54:11 +0200 drbd (9.1.11-1) unstable; urgency=medium diff --git a/docker/Dockerfile.rhel7 b/docker/Dockerfile.rhel7 index cac960bab..b4fe3b4eb 100644 --- a/docker/Dockerfile.rhel7 +++ b/docker/Dockerfile.rhel7 @@ -1,7 +1,7 @@ FROM registry.access.redhat.com/ubi7/ubi MAINTAINER Roland Kammerer -ENV DRBD_VERSION 9.1.12-rc.1 +ENV DRBD_VERSION 9.1.12 ARG release=1 LABEL name="DRBD Kernel module load container" \ diff --git a/docker/Dockerfile.rhel8 b/docker/Dockerfile.rhel8 index e2d5c9f93..0bb13e0df 100644 --- 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 -ENV DRBD_VERSION 9.1.12-rc.1 +ENV DRBD_VERSION 9.1.12 ARG release=1 LABEL name="DRBD Kernel module load container" \ diff --git a/docker/Dockerfile.rhel9 b/docker/Dockerfile.rhel9 index 8acc1fb18..68008cb69 100644 --- 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 -ENV DRBD_VERSION 9.1.12-rc.1 +ENV DRBD_VERSION 9.1.12 ARG release=1 LABEL name="DRBD Kernel module load container" \ diff --git a/drbd-kernel.spec b/drbd-kernel.spec index f307d9c47..19e23f191 100644 --- a/drbd-kernel.spec +++ b/drbd-kernel.spec @@ -1,6 +1,6 @@ Name: drbd-kernel Summary: Kernel driver for DRBD -Version: 9.1.12~rc.1 +Version: 9.1.12 Release: 1 # always require a suitable userland @@ -132,7 +132,7 @@ install -D misc/SECURE-BOOT-KEY-linbit.com.der $RPM_BUILD_ROOT/etc/pki/linbit/SE rm -rf %{buildroot} %changelog -* Mon Nov 7 2022 Philipp Reisner - 9.1.12~rc.1 +* Mon Nov 14 2022 Philipp Reisner - 9.1.12 - New upstream release. * Mon Sep 5 2022 Philipp Reisner - 9.1.11 diff --git a/drbd/linux/drbd_config.h b/drbd/linux/drbd_config.h index bb940e94b..74ac3e336 100644 --- 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.1.12-rc.1" +#define REL_VERSION "9.1.12" #define PRO_VERSION_MIN 86 #define PRO_VERSION_MAX 121