From 3ef14000f3045fb6d7efebb195c13fcacb613d16 Mon Sep 17 00:00:00 2001 From: Johanna Amann Date: Mon, 26 Sep 2016 10:33:13 -0700 Subject: [PATCH] Make elasticsearch orphaned instead of deprecated. Addresses BIT-1617 --- NEWS | 4 ---- aux/plugins | 2 +- .../bro-plugins/elasticsearch-deprecated/README.rst | 1 - doc/components/bro-plugins/elasticsearch/README | 1 + 4 files changed, 2 insertions(+), 6 deletions(-) delete mode 120000 doc/components/bro-plugins/elasticsearch-deprecated/README.rst create mode 120000 doc/components/bro-plugins/elasticsearch/README diff --git a/NEWS b/NEWS index d8387d92c2..01070428ac 100644 --- a/NEWS +++ b/NEWS @@ -333,10 +333,6 @@ 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/aux/plugins b/aux/plugins index 83ff68004a..a895d4d6d4 160000 --- a/aux/plugins +++ b/aux/plugins @@ -1 +1 @@ -Subproject commit 83ff68004adf1802bbce1295602c309e63e18ffb +Subproject commit a895d4d6d475326f400e4664e08c8f71280d3294 diff --git a/doc/components/bro-plugins/elasticsearch-deprecated/README.rst b/doc/components/bro-plugins/elasticsearch-deprecated/README.rst deleted file mode 120000 index 40894dead3..0000000000 --- a/doc/components/bro-plugins/elasticsearch-deprecated/README.rst +++ /dev/null @@ -1 +0,0 @@ -../../../../aux/plugins/elasticsearch-deprecated/README \ No newline at end of file diff --git a/doc/components/bro-plugins/elasticsearch/README b/doc/components/bro-plugins/elasticsearch/README new file mode 120000 index 0000000000..8a5b78d689 --- /dev/null +++ b/doc/components/bro-plugins/elasticsearch/README @@ -0,0 +1 @@ +../../../../aux/plugins/elasticsearch/README \ No newline at end of file