Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'

* origin/topic/bbannier/bump-spicy: Bump auxil/spicy to latest development snapshot (cherry picked from commit 4c0c758)
zeek · Jul 26, 2024 · b76096a · b76096a
1 parent b9e4669
commit b76096a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 1,11 @@
 7.0.0-rc4 | 2024-07-26 10:12:34 -0700
 
  * Bump auxil/spicy to latest development snapshot (Benjamin Bannier, Corelight)
 
  This in particular pulls in a fix for zeek/spicy#1808.
 
  (cherry picked from commit 4c0c7581c835b4dcd5339a4b34c2b82fcfc40dc3)
 
 7.0.0-rc3 | 2024-07-25 10:52:29 -0700
 
  * Generate docs for 7.0.0-rc3 (Tim Wojtulewicz)

diff --git a/VERSION b/VERSION
@@ -1 1 @@
-7.0.0-rc3
 7.0.0-rc4
diff --git a/auxil/spicy b/auxil/spicy