Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/topic/timw/update-kqueue-rapidjson'
Browse files Browse the repository at this point in the history
* origin/topic/timw/update-kqueue-rapidjson:
  Update zeek-3rdparty submodule for doctest/sqlite updates
  Update libkqueue submodule to latest upstream master
  Update rapidjson submodule to latest upstream master
  Update highwayhash submodule to latest upstream master
  • Loading branch information
timwoj committed Oct 16, 2022
2 parents ad8e829 + 456aa17 commit e3682a0
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 5 deletions.
10 changes: 10 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
5.2.0-dev.99 | 2022-10-16 15:30:25 -0700

* Update zeek-3rdparty submodule for doctest/sqlite updates (Tim Wojtulewicz, Corelight)

* Update libkqueue submodule to latest upstream master (Tim Wojtulewicz, Corelight)

* Update rapidjson submodule to latest upstream master (Tim Wojtulewicz, Corelight)

* Update highwayhash submodule to latest upstream master (Tim Wojtulewicz, Corelight)

5.2.0-dev.94 | 2022-10-13 15:12:19 -0500

* Add toplevel build dir to `PATH` for dev helper scripts. (Benjamin Bannier, Corelight)
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.2.0-dev.94
5.2.0-dev.99
2 changes: 1 addition & 1 deletion src/3rdparty
Submodule 3rdparty updated 3 files
+7,019 −6,816 doctest.h
+5,875 −3,608 sqlite3.c
+36 −6 sqlite3.h

0 comments on commit e3682a0

Please sign in to comment.