From 45788f6ed2ecce2d216d7a09471543878f42eee6 Mon Sep 17 00:00:00 2001 From: Karen Metts Date: Thu, 4 Nov 2021 19:50:36 -0400 Subject: [PATCH 1/2] Switch Logstash repo from master to main --- conf.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/conf.yaml b/conf.yaml index 2bea6411713eb..4f53d99fbee81 100644 --- a/conf.yaml +++ b/conf.yaml @@ -151,7 +151,6 @@ contents: repo: logstash path: docs/ exclude_branches: [ 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 ] - map_branches: *mapMainToMaster - repo: observability-docs path: docs/en/observability @@ -1578,8 +1577,8 @@ contents: - title: Logstash Reference prefix: en/logstash current: *stackcurrent - branches: [ master, 8.0, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 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 ] - live: *stacklive + branches: [ {main: master}, 8.0, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 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 ] + live: *stacklivemain index: docs/index.x.asciidoc chunk: 1 tags: Logstash/Reference @@ -1594,7 +1593,7 @@ contents: prefix: logstash-extra/x-pack-logstash path: docs/en private: true - exclude_branches: [ master, 8.0, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + exclude_branches: [ main, 8.0, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] - repo: logstash-docs path: docs/ From d0fbaf4d11681d7cfe585998f8032ee1e32a9218 Mon Sep 17 00:00:00 2001 From: Karen Metts Date: Thu, 4 Nov 2021 20:49:53 -0400 Subject: [PATCH 2/2] Incorporate review comments --- conf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.yaml b/conf.yaml index 4f53d99fbee81..ae1cffeed5a39 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1608,11 +1608,11 @@ contents: - repo: docs path: shared/attributes62.asciidoc - exclude_branches: [ master, 8.0, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] + exclude_branches: [ main, 8.0, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.5 ] - repo: docs path: shared/legacy-attrs.asciidoc - exclude_branches: [ master, 8.0, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 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] + exclude_branches: [ main, 8.0, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 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] - title: Logstash Versioned Plugin Reference prefix: en/logstash-versioned-plugins current: versioned_plugin_docs