huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release/2.2'

This commit is contained in:
Nate McMaster 2018-07-23 10:38:51 -07:00
parent 4182b159b8 a6fe68a301
commit acc7497b8f
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -1,9 +1,9 @@
ASP.NET Routing ASP.NET Routing
=== ===
AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/fe4o5h1s9ve86nyv/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/Routing/branch/dev) AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/fe4o5h1s9ve86nyv/branch/master?svg=true)](https://ci.appveyor.com/project/aspnetci/Routing/branch/master)
Travis: [![Travis](https://travis-ci.org/aspnet/Routing.svg?branch=dev)](https://travis-ci.org/aspnet/Routing) Travis: [![Travis](https://travis-ci.org/aspnet/Routing.svg?branch=master)](https://travis-ci.org/aspnet/Routing)
Contains routing middleware for routing requests to application logic. Contains routing middleware for routing requests to application logic.

4
benchmarkapps/Benchmarks/benchmarks.json
View File

@ -8,7 +8,7 @@
}, },
"Source": { "Source": {
"Repository": "https://github.com/aspnet/routing.git", "Repository": "https://github.com/aspnet/routing.git",
"BranchOrCommit": "dev", "BranchOrCommit": "master",
"Project": "benchmarkapps/Benchmarks/Benchmarks.csproj" "Project": "benchmarkapps/Benchmarks/Benchmarks.csproj"
}, },
"Port": 8080 "Port": 8080
@ -25,4 +25,4 @@
"PlaintextGlobalRouting": { "PlaintextGlobalRouting": {
"Path": "/plaintext" "Path": "/plaintext"
} }
} }