Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

[automated] Merge branch 'release/2.1' => 'release/2.2'#40148

Merged
wtgodbe merged 4 commits intodotnet:release/2.2from
dotnet-maestro-bot:merge/release/2.1-to-release/2.2
Aug 8, 2019
Merged

[automated] Merge branch 'release/2.1' => 'release/2.2'#40148
wtgodbe merged 4 commits intodotnet:release/2.2from
dotnet-maestro-bot:merge/release/2.1-to-release/2.2

Conversation

@dotnet-maestro-bot
Copy link

I detected changes in the release/2.1 branch which have not been merged yet to release/2.2. I'm a robot and am configured to help you automatically keep release/2.2 up to date, so I've opened this PR.

This PR merges commits made on release/2.1 by the following committers:

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/2.1
git pull --ff-only
git checkout release/2.2
git pull --ff-only
git merge --no-ff release/2.1

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/corefx HEAD:merge/release/2.1-to-release/2.2
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/corefx HEAD:merge/release/2.1-to-release/2.2

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/2.1-to-release/2.2'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/2.1-to-release/2.2 release/2.2
git pull https://github.com/dotnet-maestro-bot/corefx merge/release/2.1-to-release/2.2
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/corefx merge/release/2.1-to-release/2.2
or if you are using SSH
git checkout -b merge/release/2.1-to-release/2.2 release/2.2
git pull git@github.com:dotnet-maestro-bot/corefx merge/release/2.1-to-release/2.2
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/corefx merge/release/2.1-to-release/2.2

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

dotnet-maestro-bot and others added 3 commits July 30, 2019 12:19
…pdateDependencies

Update BuildTools to rc1-04230-01 (release/2.1)
This PR ports some important Kerberos auth fixes from the 3.0 to 2.1 LTS
branch. These fixes help enterprise customers that have complex Kerberos
authentication scenarios that involve cross Windows (Active Directory)
and Linux (Kerberos) domains/realms.

These fixes are from PRs:

* dotnet#38465 - Use 'Host' header when calculating SPN for Kerberos auth
* dotnet#38377 - Use GSS_C_NT_HOSTBASED_SERVICE format for Linux Kerberos SPN

and are related to issue dotnet#36329.
@dotnet-maestro-bot
Copy link
Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/2.1, but I could not automatically push those to merge/release/2.1-to-release/2.2 to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

@wtgodbe wtgodbe merged commit 825477c into dotnet:release/2.2 Aug 8, 2019
@karelz karelz added this to the 2.2.x milestone Dec 19, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants