Commit Graph

1071 Commits

Author SHA1 Message Date
Alexander Polcyn f5521c33f9 Revert "Merge branch 'master' into v1.3.x"
This reverts commit 79759fea1a, reversing
changes made to dc36f4df6a.
2017-04-26 14:18:39 -07:00
Jan Tattermusch 393d33c1a9 Merge pull request #10756 from jtattermusch/csharp_prevent_reuseport
Eliminate crosstalk between C# tests
2017-04-21 11:45:35 +02:00
Jan Tattermusch 09d2f55c34 eliminate crosstalk between C# tests 2017-04-20 11:39:37 +02:00
Jan Tattermusch f517fad05d expose grpc.so_reuseport in C# 2017-04-20 10:49:11 +02:00
Craig Tiller 06a30eef36 Merge github.com:grpc/grpc into cpparena 2017-04-19 14:40:20 -07:00
Craig Tiller 5b1c5f22f4 Extend clang-format to C#, Node, Ruby 2017-04-19 09:52:18 -07:00
Craig Tiller cac4e178fd Merge github.com:grpc/grpc into cpparena 2017-04-18 13:39:18 -07:00
Jan Tattermusch ed94e39ee8 setting handler is a race 2017-04-18 17:32:20 +02:00
Craig Tiller 2c6f63731c Merge github.com:grpc/grpc into cpparena 2017-04-14 13:14:10 -07:00
Sree Kuchibhotla 0e5fa9ebcd Merge branch 'master' into cq_create_api_changes 2017-04-13 18:36:23 -07:00
David Garcia Quintas 9e1acc0796 master to 1.4.0-dev 2017-04-13 16:30:15 -07:00
Sree Kuchibhotla aa5a92800f Merge branch 'master' into cq_create_api_changes 2017-04-13 03:13:17 -07:00
Craig Tiller b3d308b9a1 Merge github.com:grpc/grpc into cpparena 2017-04-12 15:16:35 -07:00
Alexander Polcyn 66db5a7085 remove src/csharp/global.json 2017-04-12 14:31:31 -07:00
Craig Tiller c20fa90c60 Merge github.com:grpc/grpc into cpparena 2017-04-12 06:44:00 -07:00
Jan Tattermusch 43713e6ae1 Merge remote-tracking branch 'upstream/v1.2.x' into HEAD 2017-04-12 09:20:29 +02:00
Sree Kuchibhotla 4ef9ce7954 Merge branch 'master' into cq_create_api_changes 2017-04-11 14:48:19 -07:00
Jan Tattermusch 498e2b350a Merge pull request #10480 from jtattermusch/csharp_new_projects
C# new .csproj projects
2017-04-11 17:24:04 +02:00
Jan Tattermusch 7f0d198e03 avoid boxing of IntPtr 2017-04-10 10:40:44 +02:00
Jan Tattermusch d587d33ef6 Merge pull request #10515 from jtattermusch/backport_global_json
Fix gRPC_performance_released dashboard.
2017-04-08 21:03:27 +02:00
murgatroid99 7cfa1bfb73 Bump version to 1.2.3 2017-04-07 10:41:21 -07:00
Jan Tattermusch 3f5b8aad64 remove global.json 2017-04-07 10:30:55 +02:00
Jan Tattermusch 6ed454ef44 make C# docker image in sync with GCE performance workers 2017-04-07 10:10:48 +02:00
Jan Tattermusch d3a5635546 Add global.json file to pick dotnet core SDK version 2017-04-07 10:10:13 +02:00
Jan Tattermusch 3ddc5da0c2 update docs 2017-04-07 09:06:45 +02:00
Jan Tattermusch b58d946efa fix package downgrade warning in dotnet restore 2017-04-07 09:06:44 +02:00
Jan Tattermusch 8b43521343 fix C# build_packages scripts 2017-04-07 09:06:43 +02:00
Jan Tattermusch 3c344d2f69 adjust run_tests scripts 2017-04-07 09:02:45 +02:00
Jan Tattermusch 7727c7649c Initial migration to new .csproj files 2017-04-07 08:51:56 +02:00
Sree Kuchibhotla a6ff103446 Merge branch 'master' into cq_create_api_changes 2017-04-06 13:09:17 -07:00
Jan Tattermusch c4c95ada89 make C# docker image in sync with GCE performance workers 2017-04-06 13:20:49 +02:00
Craig Tiller 5de46568ce Merge github.com:grpc/grpc into cpparena 2017-04-04 17:08:12 -07:00
Jan Tattermusch 0be726b34d bump version to 1.2.2 2017-04-03 20:04:34 +02:00
Jan Tattermusch b6afbf34b9 Merge pull request #10236 from jtattermusch/csharp_include_new_generated_docs
Include new namespaces in the generated docs as well
2017-04-03 18:36:16 +02:00
Craig Tiller dd36b15315 Call ref/unref, bugfixes 2017-03-31 08:27:28 -07:00
Ken Payson 484871bb03 Bump version to 1.2.1 2017-03-28 18:00:33 -07:00
Alexander Polcyn 69c2717c80 bump v1.2.x branch version to 1.2.1-pre2 2017-03-24 11:39:52 -07:00
Sree Kuchibhotla 944a56fa84 Merge branch 'master' into cq_create_api_changes 2017-03-24 10:55:39 -07:00
Nicolas "Pixel" Noble e44a50ffd7 Merge branch 'v1.2.x' of https://github.com/grpc/grpc into upmerge-1.2.0 2017-03-24 00:54:47 +01:00
Sree Kuchibhotla 615e468b08 C# changes 2017-03-22 12:34:17 -07:00
Sree Kuchibhotla 36c370793b Merge branch 'master' into cq_create_api_changes 2017-03-21 10:28:40 -07:00
Jan Tattermusch 431756b15a Include new namespaces in the generated docs as well 2017-03-21 09:54:30 +01:00
Alexander Polcyn 3e30832cca bump v1.2.x branch to 1.2.1-pre1 2017-03-20 17:00:45 -07:00
David Garcia Quintas 69e5a28635 Going for 1.2.0 2017-03-20 12:51:17 -07:00
Ken Payson 12ca7d319c Bump 1.2.x version to pre-2 2017-03-16 11:01:06 -07:00
Jan Tattermusch ff4fc13bd2 regenerate code 2017-03-14 09:27:50 +01:00
Jan Tattermusch 181085694d deprecate ChannelOptions.MaxMessageSize 2017-03-13 11:21:48 +01:00
David G. Quintas 169c553e0d Merge pull request #10078 from dgquintas/master_to_1.3.0
Bumped version to 1.3.0-dev
2017-03-10 14:09:27 -08:00
David Garcia Quintas 904e7f53ae Introducing 1.2.0-pre1 2017-03-09 15:02:19 -08:00
David Garcia Quintas 74cec10619 Bumped version to 1.3.0-dev 2017-03-09 15:00:26 -08:00