Skip to content
This repository was archived by the owner on Nov 27, 2018. It is now read-only.

Conversation

@dotnet-maestro-bot
Copy link
Contributor

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/Routing 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

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

aspnetci and others added 3 commits October 15, 2018 08:14
[auto-updated: dependencies]
…nary (aspnet#858) * Add Remove(string key, out object value) overload to RouteValueDictionary. * Consistently use _count field instead of Count property in Remove overloads. Added comment on EnsureCapacity call. Added test for removing first/middle/last entry.
@Eilon Eilon requested a review from rynowak October 17, 2018 20:53
@Eilon
Copy link
Contributor

Eilon commented Oct 17, 2018

@rynowak - Please merge ASAP so that future commits don't cause conflicts.

@rynowak
Copy link
Member

rynowak commented Oct 17, 2018

This requires changes to be ported to HTTP Abstractions and flow through the build first.

@rynowak
Copy link
Member

rynowak commented Oct 17, 2018

aspnet/HttpAbstractions#1051 merged - need to wait for packages to be available

@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

@rynowak rynowak merged commit 29b50c7 into aspnet:master Oct 20, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

6 participants