Commit Graph

25985 Commits

Author SHA1 Message Date
Ryan Brandenburg 40d5c7f839 Branching for 2.1.0-rc1 2018-04-16 16:58:44 -07:00
Ryan Brandenburg 8ddacb8b73 Branching for 2.1.0-rc1 2018-04-16 16:58:32 -07:00
Ryan Brandenburg 6ce8b74ea4 Branching for 2.1.0-rc1 2018-04-16 16:58:04 -07:00
Ryan Brandenburg e7055a11ae Branching for 2.1.0-rc1 2018-04-16 16:57:39 -07:00
Ryan Brandenburg 6c2432e544 Branching for 2.1.0-rc1 2018-04-16 16:57:26 -07:00
Ryan Brandenburg 7644204569 Branching for 2.1.0-rc1 2018-04-16 16:57:14 -07:00
Ryan Brandenburg 3385cfea1b Branching for 2.1.0-rc1 2018-04-16 16:56:17 -07:00
Ryan Brandenburg 89b25723db Branching for 2.1.0-rc1 2018-04-16 16:56:01 -07:00
Ryan Brandenburg ba3cf559bd Branching for 2.1.0-rc1 2018-04-16 16:55:36 -07:00
Ryan Brandenburg 8ee8c84288 Branching for 2.1.0-rc1 2018-04-16 16:55:22 -07:00
Ryan Brandenburg f9619367fc Branching for 2.1.0-rc1 2018-04-16 16:54:13 -07:00
ASP.NET CI 279d7cb2a0 Updating submodule(s)
AADIntegration => 353f8554a9

[auto-updated: submodules]
2018-04-16 16:46:08 -07:00
Ryan Brandenburg 2843f8cfc5
Bad merge from dev 2018-04-16 16:45:11 -07:00
Ryan Brandenburg 0cb45afdaa
Script missed this one 2018-04-16 16:44:35 -07:00
Ryan Brandenburg be1337c73e
Fixing unintended merge 2018-04-16 16:43:09 -07:00
Ryan Brandenburg ef5202d981
Fix bad update 2018-04-16 16:23:57 -07:00
Ryan Brandenburg 41ad654a26
Fix bad update 2018-04-16 16:23:34 -07:00
Ryan Brandenburg d8158719d9
Fix bad update 2018-04-16 16:23:10 -07:00
Ryan Brandenburg 02eec4342c
Fix bad update 2018-04-16 16:22:41 -07:00
ASP.NET CI b0e8081a87 Updating submodule(s)
Localization => 7cec5ccd48
MetaPackages => 5d612380e6
MusicStore => 43cb563f7b
Options => bba46a679f203728db7e32b2b1bb5f6ef1859ef4
Proxy => 13caad9f7a8f06b68be06bc6bc62efcfa86fa226
ResponseCaching => afc2c83e6c
Routing => c8d842c160
Security => 0778f5467a
ServerTests => a43546674c
Session => 1cc3bb8a85
StaticFiles => 52c45f2204
Testing => e7abaf7ad48592b48aa0afb844c8903492948cfc

[auto-updated: submodules]
2018-04-16 15:24:11 -07:00
Ryan Brandenburg 52c45f2204 Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev 2018-04-16 15:15:38 -07:00
Ryan Brandenburg 1cc3bb8a85 Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev 2018-04-16 15:10:59 -07:00
Ryan Brandenburg a43546674c Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev 2018-04-16 15:10:24 -07:00
Ryan Brandenburg 0778f5467a Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev 2018-04-16 15:09:38 -07:00
Ryan Brandenburg c8d842c160 Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev 2018-04-16 15:05:29 -07:00
Ryan Brandenburg afc2c83e6c Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev 2018-04-16 15:03:08 -07:00
Ryan Brandenburg 43cb563f7b Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev 2018-04-16 14:53:07 -07:00
Ryan Brandenburg 5d612380e6 Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev 2018-04-16 14:48:41 -07:00
ASP.NET CI 62e37aadfe Updating submodule(s)
Configuration => ec35b4b7ef3929685ef4860c8e36a4e677e878ae
CORS => af6f10030c
DataProtection => 3c40b9efd2
Diagnostics => 3acf82e5f8
EventNotification => 1327a2773a61e92ebdcf9e1b7f55c6e56b238f5a
FileSystem => 50d78868bf89a9c74176ee8271e0755937a0dd68
HtmlAbstractions => f9a0a9e646
HttpAbstractions => 5d1ee9da82
JavaScriptServices => 2c81117b4b
JsonPatch => 75839f4951

[auto-updated: submodules]
2018-04-16 14:47:31 -07:00
Ryan Brandenburg 75839f4951 Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev 2018-04-16 14:42:12 -07:00
Ryan Brandenburg 2c81117b4b Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev 2018-04-16 14:40:52 -07:00
Ryan Brandenburg 5d1ee9da82 Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev 2018-04-16 14:32:09 -07:00
Ryan Brandenburg f9a0a9e646 Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev 2018-04-16 14:31:08 -07:00
Ryan Brandenburg 3acf82e5f8 Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev 2018-04-16 14:26:38 -07:00
Ryan Brandenburg 3c40b9efd2 Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev 2018-04-16 14:24:13 -07:00
Ryan Brandenburg af6f10030c Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev 2018-04-16 14:20:27 -07:00
ASP.NET CI 139df72bfe Updating submodule(s)
Common => 268a25ba1b85e99bbcc6bcc9133198c5c8fdfa39

[auto-updated: submodules]
2018-04-16 14:10:48 -07:00
ASP.NET CI 78e745433f Updating submodule(s)
AADIntegration => 8ce4329017
Antiforgery => 7e1c2d8cb2
AuthSamples => 07fb470c3c
AzureIntegration => e77be23e2b
BasicMiddleware => cd3e968d16
BrowserLink => 7c1721c38caa05fc574b2d2ff778508afcec819a
Caching => 3b0e3fa503fe6ec32fc433e441a890be4a4736c2

[auto-updated: submodules]
2018-04-16 13:34:16 -07:00
Ryan Brandenburg cd3e968d16
Merge pull request #322 from aspnet/rybrande/MergeRelease21IntoDev
Merge release/2.1 into dev
2018-04-16 13:19:31 -07:00
Ryan Brandenburg 34467c2ddc Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev 2018-04-16 13:18:06 -07:00
Ryan Brandenburg b68ffe6af1 Branching for 2.1.0-rc1 2018-04-16 13:15:27 -07:00
Ryan Brandenburg 1eec4a11a0 Branching for 2.1.0-rc1 2018-04-16 13:15:15 -07:00
Ryan Brandenburg 07bfec916a Branching for 2.1.0-rc1 2018-04-16 13:14:56 -07:00
Ryan Brandenburg dc4a7298cc Branching for 2.1.0-rc1 2018-04-16 13:14:45 -07:00
Ryan Brandenburg 98326377dc
Merge pull request #36 from aspnet/rybrande/MergeRelease21IntoDev
Merge release/2.1 into dev
2018-04-16 13:14:21 -07:00
Ryan Brandenburg 6d9f374da0 Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev 2018-04-16 13:12:32 -07:00
Ryan Brandenburg b6a8c2a55c Update version number to 2.2.0 2018-04-16 13:09:16 -07:00
Ryan Brandenburg 4dd7b2d07a Merge branch 'release/2.1' into dev 2018-04-16 13:09:16 -07:00
Ryan Brandenburg e4e09975e3 Branching for 2.1.0-rc1 2018-04-16 13:09:11 -07:00
Ryan Brandenburg 8e8ce462f0 Merge branch 'release/2.1' into dev 2018-04-16 13:09:00 -07:00