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

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

Merged

Conversation

dotnet-maestro-bot
Copy link

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/DotNetTools merge/release/2.2-to-master:merge/release/2.2-to-master
git merge merge/release/2.2-to-master
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.

Maintainers of this repo have permission to the branch 'merge/release/2.2-to-master' on https://github.com/dotnet-maestro-bot/DotNetTools.
You can push changes to this branch to resolve conflicts or other issues in this pull request. The bot will attempt
to update this branch as more changes are discovered on release/2.2.

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.

mlorbetske and others added 11 commits August 1, 2018 12:37
Bump version of JSON.NET to 11.0.2
Pagination hasn't been dealt with yet

mac keybindings may be able to be simplified, pending some additional verification

Fix 3rd party signing cert

Bind a few common bash/zsh mappings

Check for output redirection

Make package version variable name consistent

Add --help option for the command line

Remove regions

Remove old pointer resolution code

Make command not found message more friendly

Fix issue where base address was required for requests to absolute URIs

Add options to suppress response formatting and streaming

Turn off packing for the REPL project
Default to requerying swagger for each exec

Auto-set the content-type if not yet set for requests based on swagger

Fix swagger UI command

Make error and warning colors configurable

Allow aliases to be specified in structured input based commands

Have delete not require a body

Show allowed methods for . and ..

Show verbs on the announced path after CD

Issue a request on set base and warn if there's a socket error
@mlorbetske mlorbetske merged commit 03e73cc into aspnet:master Aug 28, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants