diff --git a/CHANGES b/CHANGES index e5797bc4ee..b6f502b73c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +3.2.0-dev.735 | 2020-06-02 10:55:43 -0700 + + * Change CI script to compile from build/Makefile (Jon Siwek, Corelight) + 3.2.0-dev.734 | 2020-06-01 20:44:29 -0700 * Add missing include in util.cc (Jon Siwek, Corelight) diff --git a/VERSION b/VERSION index 9c797349eb..9b2356c560 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.2.0-dev.734 +3.2.0-dev.735 diff --git a/aux/broker b/aux/broker index 2bad9bdd69..8bba3c45c8 160000 --- a/aux/broker +++ b/aux/broker @@ -1 +1 @@ -Subproject commit 2bad9bdd690112d65cc4e1720d3d800ebc5c42ce +Subproject commit 8bba3c45c85d99752dc6f8da9b40b768e3c39804 diff --git a/ci/build.sh b/ci/build.sh index df0aa66933..621a0e857b 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -4,4 +4,5 @@ set -e set -x ./configure ${ZEEK_CI_CONFIGURE_FLAGS} +cd build make -j ${ZEEK_CI_CPUS}