From 037bceaf1b2bab5fafeaf111ea6f350206357b12 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Wed, 31 May 2023 13:42:35 +0200 Subject: [PATCH 1/3] Updating CHANGES and VERSION. --- CHANGES | 6 ++++++ VERSION | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index ca6406be59..fd9ad79e4e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +6.0.0-rc1 | 2023-05-31 12:05:27 +0200 + + * Update broker submodule to 2.6.0 release tag [nomail] [skip ci] (Tim Wojtulewicz, Corelight) + + * Update docs submodule [nomail] [skip ci] (Tim Wojtulewicz, Corelight) + 6.0.0-dev.683 | 2023-05-31 09:50:46 +0200 * Simplify code generated for Spicy analyzer port ranges. (Benjamin Bannier, Corelight) diff --git a/VERSION b/VERSION index 43fd3f713b..3f76b8391b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.0.0-dev.683 +6.0.0-rc1 From 0f017ac45bdb347045d92211a876def878657223 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Thu, 1 Jun 2023 14:21:44 +0200 Subject: [PATCH 2/3] Update link to slack in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 85c99f0564..7e44ba6b88 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Follow us on Twitter at [@zeekurity](https://twitter.com/zeekurity). [![Coverage Status](https://coveralls.io/repos/github/zeek/zeek/badge.svg?branch=master)](https://coveralls.io/github/zeek/zeek?branch=master) [![Build Status](https://img.shields.io/cirrus/github/zeek/zeek)](https://cirrus-ci.com/github/zeek/zeek) -[![Slack](https://img.shields.io/badge/slack-@zeek-brightgreen.svg?logo=slack)](https://join.slack.com/t/zeekorg/shared_invite/zt-1ev1nr7z4-rEVSsaIzYzFWpdgh2I6ZOg) +[![Slack](https://img.shields.io/badge/slack-@zeek-brightgreen.svg?logo=slack)](https://zeek.org/slack) [![Discourse](https://img.shields.io/discourse/status?server=https%3A%2F%2Fcommunity.zeek.org)](https://community.zeek.org) From bef857e68cd521b248573b10ae46fec46e7afd00 Mon Sep 17 00:00:00 2001 From: Benjamin Bannier Date: Fri, 9 Jun 2023 10:19:15 +0200 Subject: [PATCH 3/3] Bump `auxil/spicy`. --- auxil/spicy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auxil/spicy b/auxil/spicy index ec87b43037..6f43758670 160000 --- a/auxil/spicy +++ b/auxil/spicy @@ -1 +1 @@ -Subproject commit ec87b43037dba50648cb93be8940a4db23658905 +Subproject commit 6f4375867083805513a70feb32a626df40039256