Commit bad7dca6 authored by Jochen Kressin's avatar Jochen Kressin
Browse files

Merge branch '7.x' into 7.x-36

parents 448b5040 4ead7082
......@@ -27,13 +27,14 @@ elasticsearch:
searchguard:
esmajorversion: 7
version: 7.x-36.0.0
fullversion: 7.2.0-36.0.0
nextminorversion: 7.2.0-36.1.0
nextmajorversion: 7.2.0-37.0.0
version: 7.x-40.0.0
fullversion: 7.5.1-40.0.0
nextminorversion: 7.5.1-40.1.0
nextmajorversion: 7.5.1-41.0.0
islatestversion: true
ispreliminaryversion: false
allversions:
- 7x-40
- 7x-38
- 7x-37
- 7x-36
......@@ -48,7 +49,8 @@ searchguard:
- v2
docroots:
7x-38: latest
7x-40: latest
7x-38: 7.x-38
7x-37: 7.x-37
7x-36: 7.x-36
7x-35: 7.x-35
......@@ -101,6 +103,7 @@ labels:
security: Alerting Security
transformations: Transformations
triggers: Triggers
7x-40: Search Guard 7.x-40
7x-38: Search Guard 7.x-38
7x-37: Search Guard 7.x-37
7x-36: Search Guard 7.x-36
......@@ -282,8 +285,8 @@ eol:
sgversions:
#esv |sgv |kbv |available|kbn-artifact-id
search-guard-7:
- 7.5.1|38.0.0|37.0.0|yes|search-guard-kibana-plugin-7
- 7.5.0|37.1.0|37.0.0|yes|search-guard-kibana-plugin-7
- 7.5.1|40.0.0|40.0.0|yes|search-guard-kibana-plugin-7
- 7.5.0|40.0.0|40.0.0|yes|search-guard-kibana-plugin-7
- 7.4.2|37.1.0|37.0.0|yes|search-guard-kibana-plugin-7
- 7.4.1|37.1.0|37.0.0|yes|search-guard-kibana-plugin-7
- 7.4.0|37.1.0|37.0.0|yes|search-guard-kibana-plugin-7
......
......@@ -9,5 +9,5 @@ description: Changelog for the Search Guard Kibana Plugin
---
<!---
Copryight 2010 floragunn GmbH
Copyright 2020 floragunn GmbH
-->
\ No newline at end of file
......@@ -8,7 +8,7 @@ description: Changelog for the Search Guard Kibana Plugin 7.x-35.0.0
---
<!---
Copryight 2010 floragunn GmbH
Copyright 2020 floragunn GmbH
-->
# Search Guard Kibana Plugin 7.x-35.0.0
......
......@@ -8,7 +8,7 @@ description: Changelog for the Search Guard Kibana Plugin 7.x-35.0.0-beta1
---
<!---
Copryight 2010 floragunn GmbH
Copyright 2020 floragunn GmbH
-->
# Search Guard Kibana Plugin 7.x-35.0.0-beta1
......
......@@ -8,7 +8,7 @@ description: Changelog for the Search Guard Kibana Plugin 7.x-35.0.0-rc1
---
<!---
Copryight 2010 floragunn GmbH
Copyright 2020 floragunn GmbH
-->
# Search Guard Kibana Plugin 7.x-35.0.0-rc1
......
......@@ -8,7 +8,7 @@ description: Changelog for the Search Guard Kibana Plugin 7.x-35.1.0
---
<!---
Copyright 2019 floragunn GmbH
Copyright 2020 floragunn GmbH
-->
# Search Guard Kibana Plugin 7.x-35.1.0
......
......@@ -8,7 +8,7 @@ description: Changelog for the Search Guard Kibana Plugin 7.x-35.2.0
---
<!---
Copyright 2019 floragunn GmbH
Copyright 2020 floragunn GmbH
-->
# Search Guard Kibana Plugin 7.x-35.2.0
......
......@@ -8,7 +8,7 @@ description: Changelog for the Search Guard Kibana Plugin 7.x-36.0.0
---
<!---
Copyright 2019 floragunn GmbH
Copyright 2020 floragunn GmbH
-->
# Search Guard Kibana Plugin 7.x-36.0.0
......
......@@ -8,7 +8,7 @@ description: Changelog for the Search Guard Kibana Plugin 7.x-36.1.0
---
<!---
Copyright 2019 floragunn GmbH
Copyright 2020 floragunn GmbH
-->
# Search Guard Kibana Plugin 7.x-36.1.0
......
......@@ -8,7 +8,7 @@ description: Changelog for the Search Guard Kibana Plugin 7.x-36.2.0
---
<!---
Copyright 2019 floragunn GmbH
Copyright 2020 floragunn GmbH
-->
# Search Guard Kibana Plugin 7.x-36.2.0
......
......@@ -8,7 +8,7 @@ description: Changelog for the Search Guard Kibana Plugin 7.x-37.0.0
---
<!---
Copyright 2019 floragunn GmbH
Copyright 2020 floragunn GmbH
-->
# Search Guard Kibana Plugin 7.x-37.0.0
......
......@@ -9,7 +9,7 @@ description: Changelog overview for all releases of the Search Guard Kibana Plug
---
<!---
Copryight 2019 floragunn GmbH
Copyright 2020 floragunn GmbH
-->
# Search Guard Kibana Plugin Changelogs
......
......@@ -9,5 +9,5 @@ description: Changelog for the Search Guard and Search Guard SSL
---
<!---
Copryight 2010 floragunn GmbH
Copyright 2020 floragunn GmbH
-->
\ No newline at end of file
......@@ -8,7 +8,7 @@ description: Changelog for Search Guard 7.x-35.0.0
---
<!---
Copryight 2017-2019 floragunn GmbH
Copyright 2020 floragunn GmbH
-->
# Search Guard 7.x-35.0.0
......
......@@ -8,7 +8,7 @@ description: Changelog for Search Guard 7.x-35.0.0-beta1
---
<!---
Copryight 2017-2019 floragunn GmbH
Copyright 2020 floragunn GmbH
-->
# Search Guard 7.x-35.0.0-beta1
......
......@@ -8,7 +8,7 @@ description: Changelog for Search Guard 7.x-35.0.0-rc1
---
<!---
Copryight 2017-2019 floragunn GmbH
Copyright 2020 floragunn GmbH
-->
# Search Guard 7.x-35.0.0-rc1
......
......@@ -7,7 +7,7 @@ layout: changelogs
description: Changelog for Search Guard 7.x-36.0.0
---
<!--- Copyright 2019 floragunn GmbH -->
<!--- Copyright 2020 floragunn GmbH -->
# Search Guard 7.x-36.0.0
......
......@@ -2,12 +2,12 @@
title: Search Guard 7.x-36.1.0
slug: changelog-searchguard-7.x-36_1_0
category: changelogs-searchguard
order: 850
order: 820
layout: changelogs
description: Changelog for Search Guard 7.x-36.1.0
---
<!--- Copyright 2019 floragunn GmbH -->
<!--- Copyright 2020 floragunn GmbH -->
# Search Guard 7.x-36.1.0
......
......@@ -2,12 +2,12 @@
title: Search Guard 7.x-37.0.0
slug: changelog-searchguard-7.x-37_0_0
category: changelogs-searchguard
order: 850
order: 800
layout: changelogs
description: Changelog for Search Guard 7.x-37.0.0
---
<!--- Copyright 2019 floragunn GmbH -->
<!--- Copyright 2020 floragunn GmbH -->
# Search Guard 7.x-37.0.0
......
......@@ -2,12 +2,12 @@
title: Search Guard 7.x-37.1.0
slug: changelog-searchguard-7.x-37_1_0
category: changelogs-searchguard
order: 850
order: 750
layout: changelogs
description: Changelog for Search Guard 7.x-37.1.0
---
<!--- Copyright 2019 floragunn GmbH -->
<!--- Copyright 2020 floragunn GmbH -->
# Search Guard 7.x-37.1.0
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment