From 9eb3ada8c80a7da31bc63efed484038cd93e2106 Mon Sep 17 00:00:00 2001
From: Christian Kreibich <christian@corelight.com>
Date: Fri, 18 Oct 2024 09:55:20 -0700
Subject: [PATCH] Merge remote-tracking branch
 'origin/topic/bbannier/fix-docs-ci-again'

* origin/topic/bbannier/fix-docs-ci-again:
  Fix installation of Python packages in generate docs CI job again

(cherry picked from commit c28442a9a178b735e3fe1b5f5938f922a5aa7a66)
---
 .github/workflows/generate-docs.yml | 2 +-
 CHANGES                             | 9 +++++++++
 VERSION                             | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index be60b0cc9f..49b04394f7 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -17,7 +17,7 @@ jobs:
     permissions:
       contents: write  # for Git to git push
     if: github.repository == 'zeek/zeek'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       # We only perform a push if the action was triggered via a schedule
diff --git a/CHANGES b/CHANGES
index 88ce88fbd7..e182d8d713 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+7.0.3-1 | 2024-10-18 17:15:02 -0700
+
+  * Merge remote-tracking branch 'origin/topic/bbannier/fix-docs-ci-again' (Christian Kreibich, Corelight)
+
+    * origin/topic/bbannier/fix-docs-ci-again:
+      Fix installation of Python packages in generate docs CI job again
+
+    (cherry picked from commit c28442a9a178b735e3fe1b5f5938f922a5aa7a66)
+
 7.0.3 | 2024-10-04 15:42:14 -0700
 
   * Update CHANGES, VERSION, and NEWS for 7.0.3 release (Christian Kreibich, Corelight)
diff --git a/VERSION b/VERSION
index a50da181e9..f6e4a54c10 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.0.3
+7.0.3-1