Skip to content
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

[Non-Inclusive Lanuage] Replace references to master branch with main #1780

Merged
merged 2 commits into from
Jun 23, 2022

Conversation

kaddy645
Copy link
Contributor

@kaddy645 kaddy645 commented Jun 22, 2022

Signed-off-by: kaddy645 [email protected]

Description

In this change, we are replacing references to master branch with main

Issues Resolved

#1691

Check List

  • New functionality includes testing.
    • All tests pass
      • yarn test:jest
      • yarn test:jest_integration
      • yarn test:ftr
  • New functionality has been documented.
  • Commits are signed per the DCO using --signoff

@kaddy645 kaddy645 requested a review from a team as a code owner June 22, 2022 20:43
@kaddy645 kaddy645 self-assigned this Jun 22, 2022
@kaddy645 kaddy645 marked this pull request as draft June 22, 2022 20:51
@kaddy645 kaddy645 force-pushed the Issue-1691 branch 2 times, most recently from b921165 to 6eebf7f Compare June 22, 2022 23:03
DEVELOPER_GUIDE.md Outdated Show resolved Hide resolved
@kavilla
Copy link
Member

kavilla commented Jun 23, 2022

Looking good so far! For the first pass just a few comments but I think this can be ready for review after addressing. If anything was missed we can just create subsequent issues.

For the git commit though can you update the commit description to include the details you include in the PR. For example, including the issue.

Thanks @kaddy645!

Signed-off-by: kaddy645 <[email protected]>
@kaddy645 kaddy645 marked this pull request as ready for review June 23, 2022 16:20
@codecov-commenter
Copy link

Codecov Report

Merging #1780 (d9be864) into main (6aba08a) will increase coverage by 0.00%.
The diff coverage is 0.00%.

@@           Coverage Diff           @@
##             main    #1780   +/-   ##
=======================================
  Coverage   67.50%   67.51%           
=======================================
  Files        3073     3073           
  Lines       59069    59069           
  Branches     8963     8963           
=======================================
+ Hits        39877    39881    +4     
+ Misses      17008    17005    -3     
+ Partials     2184     2183    -1     
Impacted Files Coverage Δ
...ed_tests_reporter/run_failed_tests_reporter_cli.ts 17.91% <0.00%> (ø)
src/core/server/http/http_config.ts 100.00% <ø> (ø)
src/legacy/server/config/schema.js 100.00% <ø> (ø)
...containers/create_state_container_react_helpers.ts 96.96% <ø> (ø)
...h_dashboards_utils/public/state_sync/state_sync.ts 90.62% <ø> (ø)
...sync_state_storage/create_osd_url_state_storage.ts 84.00% <ø> (ø)
...te_storage/create_session_storage_state_storage.ts 80.00% <ø> (ø)
packages/osd-optimizer/src/node/cache.ts 52.77% <0.00%> (+2.77%) ⬆️
...s/osd-optimizer/src/node/node_auto_tranpilation.ts 87.75% <0.00%> (+4.08%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6aba08a...d9be864. Read the comment docs.

@kaddy645 kaddy645 requested a review from kavilla June 23, 2022 17:29
Copy link
Member

@joshuarrrr joshuarrrr left a comment

Choose a reason for hiding this comment

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

Nice work, LGTM

@kavilla kavilla merged commit 7c8eee4 into opensearch-project:main Jun 23, 2022
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1780-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7c8eee410da10b35af60430236c77ab4ccf2ba03
# Push it to GitHub
git push --set-upstream origin backport/backport-1780-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1780-to-2.x.

kavilla pushed a commit to kavilla/OpenSearch-Dashboards-1 that referenced this pull request Jun 23, 2022
…opensearch-project#1780)

In this change, we are replacing references to master branch with main

Issue:
opensearch-project#1691

Signed-off-by: kaddy645 <[email protected]>
(cherry picked from commit 7c8eee4)
kavilla pushed a commit to kavilla/OpenSearch-Dashboards-1 that referenced this pull request Jun 23, 2022
…opensearch-project#1780)

In this change, we are replacing references to master branch with main

Issue:
opensearch-project#1691

Signed-off-by: kaddy645 <[email protected]>
(cherry picked from commit 7c8eee4)

Signed-off-by: <Kartik Desai [email protected]>
kavilla pushed a commit to kavilla/OpenSearch-Dashboards-1 that referenced this pull request Jun 23, 2022
…opensearch-project#1780)

In this change, we are replacing references to master branch with main

Issue:
opensearch-project#1691

Signed-off-by: kaddy645 <[email protected]>
(cherry picked from commit 7c8eee4)

Signed-off-by: Kartik Desai <[email protected]>
joshuarrrr pushed a commit that referenced this pull request Jun 24, 2022
…#1780) (#1790)

In this change, we are replacing references to master branch with main

Issue:
#1691

Signed-off-by: kaddy645 <[email protected]>
(cherry picked from commit 7c8eee4)

Signed-off-by: Kartik Desai <[email protected]>

Co-authored-by: Kartik Desai <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Non-Inclusive Lanuage] Replace references to master branch with main
4 participants