From f38182316f01b6ce370acdf21b0961533c488b66 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Mon, 17 Jun 2019 16:20:46 -0700 Subject: [PATCH 1/2] docs: update 7.2 to current and released --- conf.yaml | 46 +++++++++++++++++++------------------- shared/versions72.asciidoc | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/conf.yaml b/conf.yaml index b09de365f0732..89ddc6b4275dd 100644 --- a/conf.yaml +++ b/conf.yaml @@ -50,7 +50,7 @@ contents: - title: Installation and Upgrade Guide prefix: en/elastic-stack - current: 7.1 + current: 7.2 index: docs/en/install-upgrade/index.asciidoc branches: [ master, 7.x, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0 ] chunk: 1 @@ -87,7 +87,7 @@ contents: - title: Getting Started prefix: en/elastic-stack-get-started - current: 7.1 + current: 7.2 index: docs/en/getting-started/index.asciidoc branches: [ master, 7.x, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3 ] chunk: 1 @@ -114,7 +114,7 @@ contents: - title: Stack Overview prefix: en/elastic-stack-overview - current: 7.1 + current: 7.2 index: docs/en/stack/index.asciidoc branches: [ master, 7.x, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3 ] chunk: 1 @@ -182,7 +182,7 @@ contents: - title: Elasticsearch Reference prefix: en/elasticsearch/reference - current: 7.1 + current: 7.2 branches: [ master, 7.x, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] index: docs/reference/index.x.asciidoc chunk: 1 @@ -253,7 +253,7 @@ contents: - title: Painless Scripting Language prefix: en/elasticsearch/painless - current: 7.1 + current: 7.2 branches: [ master, 7.x, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5] index: docs/painless/index.asciidoc chunk: 1 @@ -271,7 +271,7 @@ contents: title: Plugins and Integrations prefix: en/elasticsearch/plugins repo: elasticsearch - current: 7.1 + current: 7.2 index: docs/plugins/index.asciidoc branches: [ master, 7.x, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7 ] chunk: 2 @@ -297,7 +297,7 @@ contents: - title: Java REST Client prefix: java-rest - current: 7.1 + current: 7.2 branches: [ master, 7.x, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0 ] index: docs/java-rest/index.asciidoc tags: Clients/JavaREST @@ -319,7 +319,7 @@ contents: - title: Java API prefix: java-api - current: 7.1 + current: 7.2 branches: [ 7.x, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] index: docs/java-api/index.asciidoc tags: Clients/Java @@ -465,7 +465,7 @@ contents: - title: Elasticsearch for Apache Hadoop and Spark prefix: en/elasticsearch/hadoop - current: 7.1 + current: 7.2 branches: [ master, 7.x, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0 ] index: docs/src/reference/asciidoc/index.adoc tags: Elasticsearch/Apache Hadoop @@ -551,7 +551,7 @@ contents: - title: Kibana Reference prefix: en/kibana - current: 7.1 + current: 7.2 branches: [ master, 7.x, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 4.6, 4.5, 4.4, 4.3, 4.2, 4.1, 4.0, 3.0 ] index: docs/index.x.asciidoc chunk: 1 @@ -573,7 +573,7 @@ contents: - title: Logstash Reference prefix: en/logstash - current: 7.1 + current: 7.2 branches: [ master, 7.x, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] index: docs/index.x.asciidoc chunk: 1 @@ -615,7 +615,7 @@ contents: title: Beats Platform Reference prefix: en/beats/libbeat index: libbeat/docs/index.asciidoc - current: 7.1 + current: 7.2 branches: [ master, 7.x, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 1.3, 1.2, 1.1, 1.0.1] chunk: 1 tags: Libbeat/Reference @@ -653,7 +653,7 @@ contents: title: Packetbeat Reference prefix: en/beats/packetbeat index: packetbeat/docs/index.asciidoc - current: 7.1 + current: 7.2 branches: [ master, 7.x, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 1.3, 1.2, 1.1, 1.0.1] chunk: 1 tags: Packetbeat/Reference @@ -675,7 +675,7 @@ contents: title: Filebeat Reference prefix: en/beats/filebeat index: filebeat/docs/index.asciidoc - current: 7.1 + current: 7.2 branches: [ master, 7.x, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 1.3, 1.2, 1.1, 1.0.1] chunk: 1 tags: Filebeat/Reference @@ -701,7 +701,7 @@ contents: title: Winlogbeat Reference prefix: en/beats/winlogbeat index: winlogbeat/docs/index.asciidoc - current: 7.1 + current: 7.2 branches: [ master, 7.x, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 1.3, 1.2, 1.1 ] chunk: 1 tags: Winlogbeat/Reference @@ -723,7 +723,7 @@ contents: title: Metricbeat Reference prefix: en/beats/metricbeat index: metricbeat/docs/index.asciidoc - current: 7.1 + current: 7.2 branches: [ master, 7.x, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0 ] chunk: 1 tags: Metricbeat/Reference @@ -754,7 +754,7 @@ contents: - title: Heartbeat Reference prefix: en/beats/heartbeat - current: 7.1 + current: 7.2 index: heartbeat/docs/index.asciidoc branches: [ master, 7.x, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2 ] chunk: 1 @@ -777,7 +777,7 @@ contents: title: Auditbeat Reference prefix: en/beats/auditbeat index: auditbeat/docs/index.asciidoc - current: 7.1 + current: 7.2 branches: [ master, 7.x, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0 ] chunk: 1 tags: Auditbeat/Reference @@ -808,7 +808,7 @@ contents: - title: Functionbeat Reference prefix: en/beats/functionbeat - current: 7.1 + current: 7.2 index: x-pack/functionbeat/docs/index.asciidoc branches: [ master, 7.x, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5 ] chunk: 1 @@ -830,7 +830,7 @@ contents: - title: Journalbeat Reference prefix: en/beats/journalbeat - current: 7.1 + current: 7.2 index: journalbeat/docs/index.asciidoc branches: [ master, 7.x, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5 ] chunk: 1 @@ -925,7 +925,7 @@ contents: - title: Infrastructure Monitoring Guide prefix: en/infrastructure/guide - current: 7.1 + current: 7.2 branches: [ master, 7.x, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5 ] index: docs/en/infraops/index.asciidoc chunk: 1 @@ -944,7 +944,7 @@ contents: title: APM Overview prefix: en/apm/get-started index: docs/guide/index.asciidoc - current: 7.1 + current: 7.2 branches: [ master, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0 ] chunk: 1 tags: APM Server/Reference @@ -961,7 +961,7 @@ contents: title: APM Server Reference prefix: en/apm/server index: docs/index.asciidoc - current: 7.1 + current: 7.2 branches: [ master, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0 ] chunk: 1 tags: APM Server/Reference diff --git a/shared/versions72.asciidoc b/shared/versions72.asciidoc index 5ade025619233..bfcbe79bbca77 100644 --- a/shared/versions72.asciidoc +++ b/shared/versions72.asciidoc @@ -10,4 +10,4 @@ release-state can be: released | prerelease | unreleased ////////// -:release-state: unreleased +:release-state: released From bc984398ce58b88502ced9e312bff40fb21e1c29 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Mon, 17 Jun 2019 16:57:29 -0700 Subject: [PATCH 2/2] remove javascript-api 16.x branch --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 89ddc6b4275dd..f1b6ca542a221 100644 --- a/conf.yaml +++ b/conf.yaml @@ -351,7 +351,7 @@ contents: title: JavaScript API prefix: javascript-api current: 7.x - branches: [ master, 7.x, 6.x, 5.x, 16.x ] + branches: [ master, 7.x, 6.x, 5.x ] index: docs/index.asciidoc tags: Clients/JavaScript subject: Clients