diff --git a/CHANGES b/CHANGES index 986620bf12..0cfd42b963 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,10 @@ +2.4-715 | 2016-07-23 07:27:05 -0700 + + * SQLite writer: Remove unused string formatting function. (Johanna Amann) + + * Deprecated the ElasticSearch log writer. (Johanna Amann) + 2.4-709 | 2016-07-15 09:05:20 -0700 * Change Bro's hashing for short inputs and Bloomfilters from H3 to diff --git a/NEWS b/NEWS index 4f9aeb8056..4018f5c2bd 100644 --- a/NEWS +++ b/NEWS @@ -197,6 +197,10 @@ Deprecated Functionality decode_base64() and encode_base64(), which take an optional parameter to change the Base64 alphabet. + - The ElasticSearch log writer hasn't been maintained for a while + and is now deprecated. It will be removed with the next release. + + Bro 2.4 ======= diff --git a/VERSION b/VERSION index c498937b89..6fa9fc3279 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4-709 +2.4-715 diff --git a/doc/components/bro-plugins/elasticsearch-deprecated/README.rst b/doc/components/bro-plugins/elasticsearch-deprecated/README.rst new file mode 120000 index 0000000000..40894dead3 --- /dev/null +++ b/doc/components/bro-plugins/elasticsearch-deprecated/README.rst @@ -0,0 +1 @@ +../../../../aux/plugins/elasticsearch-deprecated/README \ No newline at end of file diff --git a/doc/components/bro-plugins/elasticsearch/README.rst b/doc/components/bro-plugins/elasticsearch/README.rst deleted file mode 120000 index 8a5b78d689..0000000000 --- a/doc/components/bro-plugins/elasticsearch/README.rst +++ /dev/null @@ -1 +0,0 @@ -../../../../aux/plugins/elasticsearch/README \ No newline at end of file