Commit Graph

57 Commits

Author SHA1 Message Date
Nate McMaster 68cc5e7846
Merge release/2.2 and aspnet/KestrelHttpServer
* Merges latest changes from the master branch of aspnet/KestrelHttpServer
* Merges changes on release/2.2
2018-11-15 08:41:55 -08:00
Nate McMaster 6cc9f6f130
Merge release/2.2 and replace submodules
* Replace the aspnet/JsonPatch git submodule and merge the master branch of its source to this repo
* Likewise for aspnet/DotNetTools
* And aspnet/HtmlAbstractions
* merge latest infrastructure changes from the release/2.2 branch
2018-11-14 22:57:10 -08:00
Nate McMaster c1c7d711b6
Merge branch 'release/2.1' into release/2.2 2018-11-14 09:27:23 -08:00
Nate McMaster 5e4166f940
Merge branch 'release/2.2' 2018-10-29 16:05:19 -07:00
Pavel Krymets 99f2ecd02f
Move transformation tests from AzureIntegration (#3726) 2018-10-26 09:49:19 -07:00
Nate McMaster dc37a2c23d
Merge branch 'release/2.2' 2018-10-19 14:11:58 -07:00
Pavel Krymets d3216a66c1
Create a build configuraition to build OOB logging site extension package (#3643) 2018-10-19 12:19:33 -07:00