Commit Graph

27559 Commits

Author SHA1 Message Date
Pavel Krymets 7a3c260394 Merge branch 'pakrym/correct-merge' into dev 2018-04-16 21:22:20 -07:00
Pavel Krymets a83869dbb3 Merge remote-tracking branch 'origin/release/2.1' into HEAD 2018-04-16 21:20:13 -07:00
James Newton-King 177f5d91ef
Merge pull request #2052 from aspnet/release/2.1
Move HubException and add serialization ctor (#2049)
2018-04-17 14:12:02 +12:00
James Newton-King d35bcea0a5
Move HubException and add serialization ctor (#2049) 2018-04-17 14:10:42 +12:00
Ryan Brandenburg 07dddce092 Branching for 2.1.0-rc1 2018-04-16 17:04:05 -07:00
Ryan Brandenburg 718989b820 Branching for 2.1.0-rc1 2018-04-16 17:03:27 -07:00
Ryan Brandenburg bf0e4f8fb5 Branching for 2.1.0-rc1 2018-04-16 17:03:13 -07:00
Ryan Brandenburg e15d1ec255 Update version number to 2.2.0 2018-04-16 17:03:02 -07:00
Ryan Brandenburg b2a6bb0806 Merge branch 'release/2.1' into dev 2018-04-16 17:03:01 -07:00
Ryan Brandenburg 25635923c8 Branching for 2.1.0-rc1 2018-04-16 17:02:57 -07:00
Ryan Brandenburg a9f6f3bb3d Branching for 2.1.0-rc1 2018-04-16 17:02:38 -07:00
Ryan Brandenburg da33bd257a Branching for 2.1.0-rc1 2018-04-16 17:02:25 -07:00
Ryan Brandenburg 30493e2fd6 Branching for 2.1.0-rc1 2018-04-16 17:02:13 -07:00
Ryan Brandenburg f4e57be575 Branching for 2.1.0-rc1 2018-04-16 17:01:45 -07:00
Ryan Brandenburg 532af71577 Branching for 2.1.0-rc1 2018-04-16 17:01:33 -07:00
Ryan Brandenburg 3ffd3480b5 Branching for 2.1.0-rc1 2018-04-16 17:01:21 -07:00
Ryan Brandenburg f08b4a7b0b Branching for 2.1.0-rc1 2018-04-16 17:00:41 -07:00
Ryan Brandenburg 864a4e39c3 Branching for 2.1.0-rc1 2018-04-16 17:00:28 -07:00
Ryan Brandenburg 23d7955517 Branching for 2.1.0-rc1 2018-04-16 17:00:04 -07:00
Ryan Brandenburg 750fd873d1 Branching for 2.1.0-rc1 2018-04-16 16:59:39 -07:00
Ryan Brandenburg 979c8f01e0 Branching for 2.1.0-rc1 2018-04-16 16:59:12 -07:00
Ryan Brandenburg 9662e2bd01 Branching for 2.1.0-rc1 2018-04-16 16:58:58 -07:00
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 9b2a7d35f4 Branching for 2.1.0-rc1 2018-04-16 16:58:19 -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