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

Backport #1024 tenant resolver #1043

Merged
merged 1 commit into from
Jul 28, 2022

Conversation

rutuja-amazon
Copy link

@rutuja-amazon rutuja-amazon commented Jul 28, 2022

Backport #1024 to branches "1.3", "1.2", "1.1", 1.0"/
Follow up issue: #1012

Check List

  • New functionality includes testing
  • New functionality has been documented
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@rutuja-amazon rutuja-amazon requested a review from a team July 28, 2022 11:27
Signed-off-by: Rutuja Surve <[email protected]>
@peternied peternied merged commit bbe43c1 into opensearch-project:1.3 Jul 28, 2022
@rutuja-amazon
Copy link
Author

@DarshitChanpura @peternied this PR had to be tagged with "backport 1.3", "backport 1.2", "backport 1.1", "backport 1.0" before merging.

@peternied peternied added backport 1.3 backport 1.2 backport to 1.2 branch labels Jul 29, 2022
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 29, 2022
Signed-off-by: Rutuja Surve <[email protected]>
(cherry picked from commit bbe43c1)
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 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-1.3 1.3
# Navigate to the new working tree
cd .worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-1043-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 bbe43c1fca80ce7e4b486e1b2831e32d3a8838e1
# Push it to GitHub
git push --set-upstream origin backport/backport-1043-to-1.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.3

Then, create a pull request where the base branch is 1.3 and the compare/head branch is backport/backport-1043-to-1.3.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 29, 2022
Signed-off-by: Rutuja Surve <[email protected]>
(cherry picked from commit bbe43c1)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 29, 2022
Signed-off-by: Rutuja Surve <[email protected]>
(cherry picked from commit bbe43c1)
@peternied
Copy link
Member

@rutuja-amazon It looks like nearly all of those backports had issues, if you'd like to see them merged please investigate them.

@rutuja-amazon
Copy link
Author

@peternied I'm looking into why auto-backporting is causing issues.

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.

3 participants