diff --git a/CHANGES b/CHANGES index c4c858d8cf..0b477cf8bd 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,14 @@ +7.0.0-dev.59 | 2024-03-15 13:36:30 +0100 + + * testing/external/cluster: Switch to docker-compose v2 (Arne Welzel, Corelight) + + The Python docker-compose executable in the docker_builder image is not + functional anymore (TypeError: kwargs_from_env() got an unexpected + keyword argument 'ssl_version'). + + docker-compose v1 has been sun-setted for quite some time. Do the + minimal to switch to docker compose v2. + 7.0.0-dev.57 | 2024-03-13 10:17:48 -0700 * Add community contributions for the 6.2 timeframe to NEWS. [skip ci] (Christian Kreibich, Corelight) diff --git a/VERSION b/VERSION index c446958739..3427e8b26e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.0.0-dev.57 +7.0.0-dev.59 diff --git a/testing/external/commit-hash.zeek-testing-cluster b/testing/external/commit-hash.zeek-testing-cluster index d8bbdd301b..6c5a060b06 100644 --- a/testing/external/commit-hash.zeek-testing-cluster +++ b/testing/external/commit-hash.zeek-testing-cluster @@ -1 +1 @@ -4545b99967c9388d0034791d4c7ffc9bb40db581 +216efb97832e412ae0197dc8e36069d8c35fd81c