search

aspnet / SignalR

[Archived] Incredibly simple real-time web for ASP.NET Core. Project moved to https://github.com/aspnet/AspNetCore
Apache License 2.0
2.38k stars 446 forks source link

[automated] Merge branch 'release/2.2' => 'master' #3291

Closed dotnet-maestro-bot closed 6 years ago

dotnet-maestro-bot commented 6 years ago

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

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

Instructions for merging

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

merge button instructions

You can also do this on command line:

git checkout -b merge/release/2.2-to-master master
git pull https://github.com/dotnet-maestro-bot/SignalR merge/release/2.2-to-master
git checkout master
git merge --no-ff merge/release/2.2-to-master
git push origin master

Instructions for resolving conflicts

:warning: 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.2-to-master'. 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.2-to-master master
git pull https://github.com/dotnet-maestro-bot/SignalR merge/release/2.2-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/SignalR merge/release/2.2-to-master

Please 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.

Eilon commented 6 years ago

@BrennanConroy - please merge ASAP.

dotnet-maestro-bot commented 6 years ago

This pull request has been updated.

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

dotnet-maestro-bot commented 6 years ago

This pull request has been updated.

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

dotnet-maestro-bot commented 6 years ago

This pull request has been updated.

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

natemcmaster commented 6 years ago

@BrennanConroy I'll need your help here. I pushed a merge commit to this PR, but CI is failing the build on NPM stuff. The changes I added where only about code signing .jar's, which shouldn't affect NPM.

BrennanConroy commented 6 years ago

Odd I fixed the merge and pushed to master, not sure why this didn't close automatically