From fa5a7c4a5be82608fc41aafd20a01456641cfcca Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Tue, 19 Nov 2024 19:16:51 +0100 Subject: [PATCH] Merge remote-tracking branch 'origin/topic/awelzel/bump-zeekjs-0-13-2' * origin/topic/awelzel/bump-zeekjs-0-13-2: Bump zeekjs to 0.13.2 (cherry picked from commit 6e916efe8d9470cdca7b4f4933c44b8c1cab66b0) --- CHANGES | 6 ++++++ VERSION | 2 +- auxil/zeekjs | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 7e03228332..e4cb5ab849 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +7.0.3-27 | 2024-11-19 11:19:00 -0700 + + * Bump zeekjs to 0.13.2 (Arne Welzel, Corelight) + + (cherry picked from commit 6e916efe8d9470cdca7b4f4933c44b8c1cab66b0) + 7.0.3-26 | 2024-11-19 10:56:06 -0700 * Merge remote-tracking branch 'origin/topic/timw/speed-up-zam-ci-testing' (Tim Wojtulewicz, Corelight) diff --git a/VERSION b/VERSION index e7bc80348c..c91c73a9ec 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.0.3-26 +7.0.3-27 diff --git a/auxil/zeekjs b/auxil/zeekjs index 805a4663f9..d5bae4c4d2 160000 --- a/auxil/zeekjs +++ b/auxil/zeekjs @@ -1 +1 @@ -Subproject commit 805a4663f9326726d179f6af15a592ab4d9c2952 +Subproject commit d5bae4c4d29e3c5e87d54f94d7a9b3f86ae856a8