Skip to content

Rename master to main for Beats project #2337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 3, 2022
Merged

Rename master to main for Beats project #2337

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
750e069
Rename master to main for Beats project
v1v Jan 6, 2022
1f2d20e
Update conf.yaml
v1v Feb 3, 2022
0ee7f0e
beats: missing master reference
v1v Feb 3, 2022
8872b20
beats: no more master branch
v1v Feb 3, 2022
5b9adb5
Merge remote-tracking branch 'upstream/master' into feature/beats-neu…
v1v Feb 3, 2022
3ad9486
beats: no more master branch
v1v Feb 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 20 additions & 22 deletions conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ contents:
repo: beats
path: libbeat/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: elasticsearch
path: docs/
Expand Down Expand Up @@ -1202,7 +1201,6 @@ contents:
repo: beats
path: libbeat/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: docs
path: shared/versions/stack/{version}.asciidoc
Expand Down Expand Up @@ -1796,8 +1794,8 @@ contents:
prefix: en/beats/libbeat
index: libbeat/docs/index.asciidoc
current: *stackcurrent
branches: [ master, 8.0, 7.17, 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, 1.3, 1.2, 1.1, 1.0.1]
live: *stacklive
branches: [ {main: master}, 8.0, 7.17, 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, 1.3, 1.2, 1.1, 1.0.1]
live: *stacklivemain
chunk: 1
tags: Libbeat/Reference
subject: libbeat
Expand All @@ -1821,8 +1819,8 @@ contents:
prefix: en/beats/auditbeat
index: auditbeat/docs/index.asciidoc
current: *stackcurrent
branches: [ master, 8.0, 7.17, 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 ]
live: *stacklive
branches: [ {main: master}, 8.0, 7.17, 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 ]
live: *stacklivemain
chunk: 1
tags: Auditbeat/Reference
respect_edit_url_overrides: true
Expand Down Expand Up @@ -1874,8 +1872,8 @@ contents:
prefix: en/beats/filebeat
index: filebeat/docs/index.asciidoc
current: *stackcurrent
branches: [ master, 8.0, 7.17, 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, 1.3, 1.2, 1.1, 1.0.1]
live: *stacklive
branches: [ {main: master}, 8.0, 7.17, 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, 1.3, 1.2, 1.1, 1.0.1]
live: *stacklivemain
chunk: 1
tags: Filebeat/Reference
respect_edit_url_overrides: true
Expand Down Expand Up @@ -1929,8 +1927,8 @@ contents:
prefix: en/beats/functionbeat
current: *stackcurrent
index: x-pack/functionbeat/docs/index.asciidoc
branches: [ master, 8.0, 7.17, 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 ]
live: *stacklive
branches: [ {main: master}, 8.0, 7.17, 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 ]
live: *stacklivemain
chunk: 1
tags: Functionbeat/Reference
respect_edit_url_overrides: true
Expand Down Expand Up @@ -1978,8 +1976,8 @@ contents:
prefix: en/beats/heartbeat
current: *stackcurrent
index: heartbeat/docs/index.asciidoc
branches: [ master, 8.0, 7.17, 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 ]
live: *stacklive
branches: [ {main: master}, 8.0, 7.17, 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 ]
live: *stacklivemain
chunk: 1
tags: Heartbeat/Reference
respect_edit_url_overrides: true
Expand Down Expand Up @@ -2025,8 +2023,8 @@ contents:
prefix: en/beats/metricbeat
index: metricbeat/docs/index.asciidoc
current: *stackcurrent
branches: [ master, 8.0, 7.17, 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 ]
live: *stacklive
branches: [ {main: master}, 8.0, 7.17, 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 ]
live: *stacklivemain
chunk: 1
tags: Metricbeat/Reference
respect_edit_url_overrides: true
Expand Down Expand Up @@ -2082,8 +2080,8 @@ contents:
prefix: en/beats/packetbeat
index: packetbeat/docs/index.asciidoc
current: *stackcurrent
branches: [ master, 8.0, 7.17, 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, 1.3, 1.2, 1.1, 1.0.1]
live: *stacklive
branches: [ {main: master}, 8.0, 7.17, 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, 1.3, 1.2, 1.1, 1.0.1]
live: *stacklivemain
chunk: 1
tags: Packetbeat/Reference
respect_edit_url_overrides: true
Expand Down Expand Up @@ -2125,8 +2123,8 @@ contents:
prefix: en/beats/winlogbeat
index: winlogbeat/docs/index.asciidoc
current: *stackcurrent
branches: [ master, 8.0, 7.17, 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, 1.3, 1.2, 1.1 ]
live: *stacklive
branches: [ {main: master}, 8.0, 7.17, 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, 1.3, 1.2, 1.1 ]
live: *stacklivemain
chunk: 1
tags: Winlogbeat/Reference
respect_edit_url_overrides: true
Expand Down Expand Up @@ -2167,9 +2165,9 @@ contents:
- title: Beats Developer Guide
prefix: en/beats/devguide
index: docs/devguide/index.asciidoc
current: master
branches: [ master, 8.0, 7.17, 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 ]
live: *stacklive
current: main
Copy link
Member Author

@v1v v1v Feb 3, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bmorelli25 , I'm not sure if the previous change should point to *stackcurrent, so I'll rename it to main but something to look at maybe in a follow up

Suggested change
current: main
current: *stackcurrent

branches: [ {main: master}, 8.0, 7.17, 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 ]
live: *stacklivemain
chunk: 1
tags: Devguide/Reference
subject: Beats
Expand Down Expand Up @@ -2199,7 +2197,7 @@ contents:
prefix: en/beats/loggingplugin
current: *stackcurrent
index: x-pack/dockerlogbeat/docs/index.asciidoc
branches: [ master, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6 ]
branches: [ {main: master}, 8.0, 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6 ]
chunk: 1
tags: Elastic Logging Plugin/Reference
respect_edit_url_overrides: true
Expand Down