Commit Graph

1904 Commits

Author SHA1 Message Date
Mikael Mengistu cdd7387159
Java Client Steaming (#3301) 2018-11-16 16:29:32 -08:00
BrennanConroy 7015fb20f2 Merge branch 'release/2.2' 2018-11-16 12:02:43 -08:00
BrennanConroy e2a712a1cd
Add logging to HubConnectionHandlerTests (#3286) 2018-11-16 10:00:18 -08:00
BrennanConroy 05b0d41533
Merge pull request #3304 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-11-14 11:28:08 -08:00
BrennanConroy 5e96262b2a Updated PR conflicts 2018-11-14 11:08:15 -08:00
BrennanConroy 7e96a02975
Skip cert errors on Chromium too (#3299) 2018-11-14 10:48:26 -08:00
BrennanConroy 3896fc7242
Cleanup process (#3300) 2018-11-14 10:48:12 -08:00
BrennanConroy 012f953a9d Merge branch 'release/2.2' 2018-11-12 18:03:50 -08:00
BrennanConroy b476df9acd
Custom CORS-like middleware to allow wildcard origin in test app (#3292) 2018-11-12 09:06:51 -08:00
Nate McMaster a9def470e3
Don't attempt to detect java if SkipJavaClient is true 2018-11-11 20:24:25 -08:00
Nate McMaster a242dc726d
Ensure .jar files are included in code signing with the correct certificate 2018-11-11 16:31:08 -08:00
BrennanConroy df668017ee
Add HTTPS tests for node/browser tests (#3283) 2018-11-09 15:29:00 -08:00
BrennanConroy 67a37f9db3
Merge pull request #3280 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-11-09 11:27:03 -08:00
Mikael Mengistu dea121061b
Update RxJava dependency. (#3272) 2018-11-08 12:30:10 -08:00
BrennanConroy d0dac557ac
Fix flaky test (#3268) 2018-11-08 11:47:26 -08:00
Andrew Stanton-Nurse ead32f295f Merge branch 'release/2.2' 2018-11-07 15:29:08 -08:00
dotnet-maestro-bot c206ea612a [automated] Merge branch 'release/2.2' => 'master' (#3278)
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:

* @anurse

## 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.

<img alt="merge button instructions" src="https://i.imgur.com/GepcNJV.png" width="300" />

You can also do this on command line:

```
git checkout -b merge/release/2.2-to-master master
git pull https://github.com/dotnet-maestro-bot/SignalR merge/release/2.2-to-master
git checkout master
git merge --no-ff merge/release/2.2-to-master
git push origin master
```

## Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this [using GitHub][resolve-github] or using the [command line][resolve-cli].

[resolve-github]: https://help.github.com/articles/resolving-a-merge-conflict-on-github/
[resolve-cli]: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/

## Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/2.2-to-master'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

```
git checkout -b merge/release/2.2-to-master master
git pull https://github.com/dotnet-maestro-bot/SignalR merge/release/2.2-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/SignalR merge/release/2.2-to-master
```

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.
2018-11-07 15:27:19 -08:00
Andrew Stanton-Nurse f4d3ebe09a
Add docs blurb to Readme (#3276) 2018-11-07 12:10:48 -08:00
BrennanConroy 755264e335 Merge branch 'release/2.2' 2018-11-07 08:52:13 -08:00
BrennanConroy a03b8f85a8
Add docker retry to stackexchange redis tests (#3270) 2018-11-07 08:48:49 -08:00
BrennanConroy 56f78b4593
Retry redis docker (#3265) 2018-11-06 15:23:03 -08:00
BrennanConroy cbbd0278ba Merge branch 'release/2.2' 2018-11-06 14:52:50 -08:00
Pavel Krymets 7ae4cb0fb6
Remove obsolete logging API usage (#3267) 2018-11-06 14:30:09 -08:00
BrennanConroy bbdf95e449
Skip flaky java test (#3266) 2018-11-06 14:15:53 -08:00
BrennanConroy ffd4bcd850
Server per test (#3253) 2018-11-06 09:33:15 -08:00
BrennanConroy 71e2f45450
Wrap log in enabled check 2018-11-06 09:24:34 -08:00
BrennanConroy b2037efa08
Merge pull request #3250 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-11-02 08:27:42 -07:00
BrennanConroy b006a2c789
Clean up logging (#3247) 2018-11-01 15:47:01 -07:00
BrennanConroy 172b635886
Merge pull request #3249 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-11-01 15:18:27 -07:00
Andrew Stanton-Nurse 4496366794
Remove Jenkins PR build config files 2018-11-01 11:03:47 -07:00
BrennanConroy e5e51ac6ca
Merge pull request #3243 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-31 16:28:19 -07:00
BrennanConroy 83139d36f4
Add some missing test logging (#3242) 2018-10-31 16:05:26 -07:00
BrennanConroy cd4a1c036a
Remove SignalR.Redis package (#3241) 2018-10-31 15:16:44 -07:00
BrennanConroy 867c315a56
Merge pull request #3240 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-31 11:12:05 -07:00
Mikael Mengistu 5b486cdfa9 Java API Doc revisions 2018-10-31 10:42:43 -07:00
BrennanConroy c7d3690ca0 Merge branch 'release/2.2' 2018-10-30 22:29:03 -07:00
BrennanConroy 865de16086
Enable cookie jar for Node client using request package (#3202) 2018-10-30 22:13:24 -07:00
BrennanConroy 36ca210a65 [Java] Add null ref test for websocket 2018-10-30 15:43:43 -07:00
BrennanConroy 46a3d7e342 Merge branch 'release/2.2' of https://github.com/DHosseiny/SignalR into DHosseiny-release/2.2 2018-10-30 15:43:10 -07:00
BrennanConroy c9600ac2d4
[Java] Log invocation binding failures (#3160) 2018-10-30 13:49:43 -07:00
BrennanConroy e0f547e211
Merge pull request #3226 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-29 19:41:42 -07:00
BrennanConroy 73f2f19984
[Java] API level support down to 23 2018-10-29 16:53:47 -07:00
Mikael Mengistu 1edf818104 Remove hidden BiConsumer reference (#3215) 2018-10-29 13:33:19 -07:00
BrennanConroy 9407fe12f6
RxJava is on the public API so the library needs to declare it as such (#3155) 2018-10-29 11:43:01 -07:00
Seyyed davud hosseiny e8b9dc52ba
Fix NullPointerException when unboxing null to int.
Change int to Integer to allow use null as code.
2018-10-27 10:48:14 +03:30
Mikael Mengistu 86f4e80ecf
Merge pull request #3214 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-26 13:55:51 -07:00
Mikael Mengistu e1b602a7c5
Remove BiFunction Ref (#3213) 2018-10-26 13:38:35 -07:00
Mikael Mengistu 64222fa735
Merge pull request #3212 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-26 12:56:44 -07:00
Mikael Mengistu 2ad1996220
Remove LogLevel enum (#3203) 2018-10-26 10:50:24 -07:00
Mikael Mengistu dcf21dd486
Merge pull request #3205 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-25 16:54:54 -07:00