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
755264e335
Merge branch 'release/2.2'
2018-11-07 08:52:13 -08:00
a03b8f85a8
Add docker retry to stackexchange redis tests ( #3270 )
2018-11-07 08:48:49 -08:00
56f78b4593
Retry redis docker ( #3265 )
2018-11-06 15:23:03 -08:00
cbbd0278ba
Merge branch 'release/2.2'
2018-11-06 14:52:50 -08:00
7ae4cb0fb6
Remove obsolete logging API usage ( #3267 )
2018-11-06 14:30:09 -08:00
bbdf95e449
Skip flaky java test ( #3266 )
2018-11-06 14:15:53 -08:00
ffd4bcd850
Server per test ( #3253 )
2018-11-06 09:33:15 -08:00
71e2f45450
Wrap log in enabled check
2018-11-06 09:24:34 -08:00
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
b006a2c789
Clean up logging ( #3247 )
2018-11-01 15:47:01 -07:00
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
4496366794
Remove Jenkins PR build config files
2018-11-01 11:03:47 -07:00
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
83139d36f4
Add some missing test logging ( #3242 )
2018-10-31 16:05:26 -07:00
cd4a1c036a
Remove SignalR.Redis package ( #3241 )
2018-10-31 15:16:44 -07:00
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
5b486cdfa9
Java API Doc revisions
2018-10-31 10:42:43 -07:00
c7d3690ca0
Merge branch 'release/2.2'
2018-10-30 22:29:03 -07:00
865de16086
Enable cookie jar for Node client using request package ( #3202 )
2018-10-30 22:13:24 -07:00
36ca210a65
[Java] Add null ref test for websocket
2018-10-30 15:43:43 -07:00
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
c9600ac2d4
[Java] Log invocation binding failures ( #3160 )
2018-10-30 13:49:43 -07:00
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
73f2f19984
[Java] API level support down to 23
2018-10-29 16:53:47 -07:00
1edf818104
Remove hidden BiConsumer reference ( #3215 )
2018-10-29 13:33:19 -07:00
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
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
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
e1b602a7c5
Remove BiFunction Ref ( #3213 )
2018-10-26 13:38:35 -07:00
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
2ad1996220
Remove LogLevel enum ( #3203 )
2018-10-26 10:50:24 -07:00
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
fc3a1fee61
Remove Dependency on java.util.Function ( #3186 )
2018-10-25 14:50:21 -07:00
a79d23ea72
Merge pull request #3204 from dotnet-maestro-bot/merge/release/2.2-to-master
...
[automated] Merge branch 'release/2.2' => 'master'
2018-10-25 14:49:29 -07:00
0aab8e5dd0
added maven badge to readme.md ( #3201 )
...
* added lines to the sample code that result in it working with copy/paste
* removed readme.md change
* added maven badge to readme.md
2018-10-25 12:38:05 -07:00
44dd99fd54
Update deps
2018-10-25 10:00:01 -07:00
c971e0ba3a
Merge branch 'release/2.2'
2018-10-25 09:44:30 -07:00
132eac5e37
Add version numbers to the build.gradle file ( #3195 )
2018-10-24 13:42:33 -07:00
d5a01a4d9d
Merge pull request #3196 from dotnet-maestro-bot/merge/release/2.2-to-master
...
[automated] Merge branch 'release/2.2' => 'master'
2018-10-24 11:20:52 -07:00
29c06e2636
Update deps ( #3170 )
2018-10-24 11:18:41 -07:00
c129d272a4
Update npm readme with Node info ( #3194 )
...
I noticed that these READMEs are out of date now that we have "official" node support.
2018-10-24 11:15:34 -07:00
7eb5afd141
Update Build Badges ( #3184 )
2018-10-24 11:03:10 -07:00
ce114f2005
Merge pull request #3181 from dotnet-maestro-bot/merge/release/2.2-to-master
...
[automated] Merge branch 'release/2.2' => 'master'
2018-10-23 11:17:55 -07:00
f7d10bec02
[Java] Plumb RxJava through client ( #3148 )
2018-10-23 10:52:26 -07:00
4990c315e5
Merge pull request #3180 from dotnet-maestro-bot/merge/release/2.2-to-master
...
[automated] Merge branch 'release/2.2' => 'master'
2018-10-23 10:34:05 -07:00
0f5fc5b912
Remove Duration API from Java Client ( #3173 )
2018-10-23 09:45:01 -07:00
dbbb759a8b
Merge pull request #3178 from dotnet-maestro-bot/merge/release/2.2-to-master
...
[automated] Merge branch 'release/2.2' => 'master'
2018-10-23 09:17:41 -07:00
63900a462b
Use Node https module for https requests ( #3171 )
2018-10-23 08:21:54 -07:00
2bea4608fa
Fix tests to use dynamic ports ( #3177 )
2018-10-22 20:32:53 -07:00
dotnet-maestro-bot
BrennanConroy
Pavel Krymets
Andrew Stanton-Nurse
Mikael Mengistu
Seyyed davud hosseiny
Brady Gaster
