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.

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

Conversation

v1v
Copy link
Member

@v1v v1v commented Jan 6, 2022

What

Neutral name branch for elastic/beats

Issues

Requires elastic/beats#29710

@v1v v1v self-assigned this Jan 6, 2022
@v1v
Copy link
Member Author

v1v commented Feb 3, 2022

run elasticsearch-ci/docs

@v1v v1v marked this pull request as ready for review February 3, 2022 10:05
@v1v v1v requested review from jlind23, cmacknz and bmorelli25 February 3, 2022 10:06
@v1v
Copy link
Member Author

v1v commented Feb 3, 2022

run elasticsearch-ci/docs

v1v and others added 2 commits February 3, 2022 10:39
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

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

v1v added 3 commits February 3, 2022 11:18
…tral-naming

* upstream/master: (28 commits)
  Fixes .net book generation. (elastic#2367)
  Add main branch to elasticsearch-net repo to docs build. (elastic#2196)
  Update attributes.asciidoc (elastic#2365)
  Note that the full path is required for local doc build (elastic#2364)
  Bump current version to 7.17 (elastic#2333)
  moves old file back to bottom
  add new path for kibana links check
  apm: Neutral naming for apm-agent-java (elastic#2350)
  Change current to MS-68 (elastic#2355)
  Remove unnecessary branch mapping for package-spec (elastic#2359)
  Adds tech preview macro, updates experimental (elastic#2340)
  [DOCS] Add `plugins-7x` and `plugins-6x` attributes (elastic#2358)
  apm: Neutral naming for apm-agent-python (elastic#2348)
  apm: Neutral naming for apm-agent-rum-js (elastic#2354)
  apm: Neutral naming for apm-agent-dotnet (elastic#2352)
  apm: Neutral naming for apm-agent-nodejs (elastic#2353)
  Neutral naming for apm-agent-go (elastic#2351)
  apm: Neutral naming for apm-agent-php (elastic#2349)
  Add 7.last attribute for APM Guide (elastic#2356)
  [apm] main branch for apm-agent-ruby (elastic#2347)
  ...
Copy link
Contributor

@szabosteve szabosteve left a comment

Choose a reason for hiding this comment

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

LGTM!

@szabosteve szabosteve merged commit 2b74ba0 into elastic:master Feb 3, 2022
v1v added a commit to v1v/docs that referenced this pull request Feb 3, 2022
…r-neutral-naming

* upstream/master:
  [DOCS] 8.0.0-rc2 version attributes. (elastic#2345)
  Rename master to main for Beats project (elastic#2337)
  Fixes .net book generation. (elastic#2367)
  Add main branch to elasticsearch-net repo to docs build. (elastic#2196)
  Update attributes.asciidoc (elastic#2365)
  update stack ecs pointer
  adding in new ecs options per the 8.2 sff
  Note that the full path is required for local doc build (elastic#2364)
  Bump current version to 7.17 (elastic#2333)
  moves old file back to bottom
  add new path for kibana links check
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants