diff --git a/CHANGES b/CHANGES index dbf3b11825..dbf67b1918 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,5 @@ -2.5-765 | 2018-07-23 23:38:28 +0000 +2.5-766 | 2018-07-24 01:39:07 +0000 * Clusterization of configureation framework. (Johanna Amann, Corelight) diff --git a/VERSION b/VERSION index 83d9c9f70c..08fbf3ec7b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5-765 +2.5-766 diff --git a/testing/btest/scripts/base/frameworks/config/basic_cluster.bro b/testing/btest/scripts/base/frameworks/config/basic_cluster.bro index c6e0bf15a6..6423773b26 100644 --- a/testing/btest/scripts/base/frameworks/config/basic_cluster.bro +++ b/testing/btest/scripts/base/frameworks/config/basic_cluster.bro @@ -1,3 +1,5 @@ +# @TEST-SERIALIZE: comm +# # @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 bro %INPUT # @TEST-EXEC: sleep 1 # @TEST-EXEC: btest-bg-run worker-1 BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 bro %INPUT diff --git a/testing/btest/scripts/base/frameworks/config/cluster_resend.bro b/testing/btest/scripts/base/frameworks/config/cluster_resend.bro index 9e82672f2b..e5c871a578 100644 --- a/testing/btest/scripts/base/frameworks/config/cluster_resend.bro +++ b/testing/btest/scripts/base/frameworks/config/cluster_resend.bro @@ -1,3 +1,5 @@ +# @TEST-SERIALIZE: comm +# # @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 bro %INPUT # @TEST-EXEC: sleep 1 # @TEST-EXEC: btest-bg-run worker-1 BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 bro %INPUT diff --git a/testing/btest/scripts/base/frameworks/config/read_config_cluster.bro b/testing/btest/scripts/base/frameworks/config/read_config_cluster.bro index 4d35b794bc..ea806fc18c 100644 --- a/testing/btest/scripts/base/frameworks/config/read_config_cluster.bro +++ b/testing/btest/scripts/base/frameworks/config/read_config_cluster.bro @@ -1,3 +1,5 @@ +# @TEST-SERIALIZE: comm +# # @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 bro %INPUT # @TEST-EXEC: sleep 1 # @TEST-EXEC: btest-bg-run worker-1 BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 bro %INPUT