Skip to content

use main default branch#29710

Merged
v1v merged 2 commits intoelastic:mainfrom
v1v:feature/update-main-neutral-naming
Feb 3, 2022
Merged

use main default branch#29710
v1v merged 2 commits intoelastic:mainfrom
v1v:feature/update-main-neutral-naming

Conversation

@v1v
Copy link
Copy Markdown
Member

@v1v v1v commented Jan 5, 2022

What does this PR do?

Rename master for main in:

Why is it important?

Neutral naming initiative

Follow ups

  • Doc changes to be done in another PR.
  • Change docs to support master for the time being.
  • Change infra jjb automation.

@v1v v1v added backport-v8.0.0 Automated backport with mergify backport-7.17 Automated backport to the 7.17 branch with mergify labels Jan 5, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jan 5, 2022
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jan 5, 2022 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Reason: null

  • Start Time: 2022-02-02T20:43:51.839+0000

  • Duration: 167 min 2 sec

  • Commit: 30171e5

Test stats 🧪

Test Results
Failed 0
Passed 48139
Skipped 4292
Total 52431

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jan 10, 2022

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b feature/update-main-neutral-naming upstream/feature/update-main-neutral-naming
git merge upstream/master
git push upstream feature/update-main-neutral-naming

@v1v v1v mentioned this pull request Jan 20, 2022
Merged
@mtojek mtojek added the Team:Ecosystem Label for the Packages Ecosystem team label Jan 24, 2022
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jan 24, 2022
@v1v v1v mentioned this pull request Jan 27, 2022
Merged
@v1v v1v requested review from jlind23, jsoriano, ph and ruflin February 2, 2022 20:41
@v1v v1v self-assigned this Feb 2, 2022
@v1v v1v requested a review from a team February 2, 2022 20:41
@v1v v1v marked this pull request as ready for review February 2, 2022 20:43
jlind23
jlind23 reviewed Feb 3, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@jlind23 jlind23 left a comment

Choose a reason for hiding this comment

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

Looks good to me. Will github protection rules be updating accordingly?

@botelastic botelastic bot added the Team:Automation Label for the Observability productivity team label Feb 3, 2022
@v1v
Copy link
Copy Markdown
Member Author

v1v commented Feb 3, 2022

Looks good to me. Will github protection rules be updating accordingly?

Yes

image

jsoriano
jsoriano approved these changes Feb 3, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@jsoriano jsoriano left a comment

Choose a reason for hiding this comment

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

LGTM, but please wait for some other approval 🙂

@v1v v1v requested a review from cmacknz February 3, 2022 09:58
jlind23
jlind23 approved these changes Feb 3, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@jlind23 jlind23 left a comment

Choose a reason for hiding this comment

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

LGTM

@v1v v1v merged commit 2379370 into elastic:main Feb 3, 2022
mergify bot pushed a commit that referenced this pull request Feb 3, 2022
@v1v
use main default branch (#29710)
51c9d52 
(cherry picked from commit 2379370)

# Conflicts:
#	.ci/beats-tester-bc.groovy
#	.ci/build-docker-images.groovy
#	.ci/jobs/apm-beats-update.yml
#	.ci/jobs/beats-schedule-daily.yml
#	.ci/jobs/beats-test-infra.yml
#	.ci/jobs/beats-tester-bc.yml
#	.ci/jobs/beats-tester.yml
#	.ci/jobs/beats.yml
#	.ci/jobs/build-it-docker-images.yml
#	.ci/jobs/packaging.yml
#	.ci/schedule-daily.groovy
#	.ci/schedule-weekly.groovy
#	.mergify.yml
#	CHANGELOG-developer.asciidoc
#	README.md
#	filebeat/_meta/test/docs/testing.md
#	x-pack/elastic-agent/README.md
@mergify mergify bot mentioned this pull request Feb 3, 2022
Closed
mergify bot pushed a commit that referenced this pull request Feb 3, 2022
@v1v
use main default branch (#29710)
7b7fa34 
(cherry picked from commit 2379370)

# Conflicts:
#	.ci/jobs/apm-beats-update.yml
#	.ci/jobs/beats-tester.yml
#	.ci/jobs/beats.yml
#	.ci/jobs/packaging.yml
#	.ci/schedule-daily.groovy
#	.ci/schedule-weekly.groovy
#	.mergify.yml
#	README.md
#	filebeat/_meta/test/docs/testing.md
#	x-pack/elastic-agent/README.md
@mergify mergify bot mentioned this pull request Feb 3, 2022
Merged
@v1v v1v mentioned this pull request Feb 4, 2022
Merged
@v1v v1v added the backport-v8.1.0 Automated backport with mergify label Feb 8, 2022
mergify bot pushed a commit that referenced this pull request Feb 8, 2022
@v1v
use main default branch (#29710)
fd6021f 
(cherry picked from commit 2379370)

# Conflicts:
#	README.md
@mergify mergify bot mentioned this pull request Feb 8, 2022
Merged
v1v pushed a commit that referenced this pull request Mar 1, 2022
@mergify
[8.0](backport #29710) use main default branch (#30179)
3fa745d
v1v pushed a commit that referenced this pull request Mar 3, 2022
@mergify
[8.1](backport #29710) use main default branch (#30278)
9bd4832
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jsoriano jsoriano jsoriano approved these changes

@kuisathaverat kuisathaverat kuisathaverat approved these changes

@jlind23 jlind23 jlind23 approved these changes

@ruflin ruflin Awaiting requested review from ruflin

@ph ph Awaiting requested review from ph

@cmacknz cmacknz Awaiting requested review from cmacknz

Assignees

@v1v v1v

Labels

backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.0.0 Automated backport with mergify backport-v8.1.0 Automated backport with mergify Team:Automation Label for the Observability productivity team Team:Ecosystem Label for the Packages Ecosystem team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@v1v @elasticmachine @jsoriano @kuisathaverat @jlind23 @mtojek