search

aspnet / Hosting

[Archived] Code for hosting and starting up an ASP.NET Core application. Project moved to https://github.com/aspnet/Extensions and https://github.com/aspnet/AspNetCore
Apache License 2.0
553 stars 312 forks source link

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

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 master
git pull
git fetch --force https://github.com/dotnet-maestro-bot/Hosting merge/release/2.2-to-master:merge/release/2.2-to-master
git merge merge/release/2.2-to-master
git push

:warning: If there are merge conflicts, you will need to resolve them manually before merging.

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