Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' into add_udp_server_2 | Robbie Shade | 2015-08-13 | |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||
| | | * | | | | Merge branch 'master' of github.com:grpc/grpc into compression-interop | David Garcia Quintas | 2015-08-13 | |
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||
* | | | | | | | Removing gpr_cancelable. | Nicolas "Pixel" Noble | 2015-08-13 | |
| | | * | | | | Updated outdated Grpc.mak | David Garcia Quintas | 2015-08-13 | |
| | | * | | | | Merge branch 'master' of github.com:grpc/grpc into compression-interop | David Garcia Quintas | 2015-08-13 | |
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' into add_udp_server_2 | Robbie Shade | 2015-08-13 | |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||
| | | | | | * | Merge branch 'master' into tracing_api | Alistair Veitch | 2015-08-13 | |
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | | | ||||
| | | | | * | | Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3 | Jan Tattermusch | 2015-08-13 | |
| | | | | |\ \ | |_|_|_|_|/ / |/| | | | | | | ||||
| | | | | * | | update instructions on building protoc plugins | Jan Tattermusch | 2015-08-13 | |
| | | | | | * | add all new content | Alistair Veitch | 2015-08-13 | |
| | | | * | | | Merge remote-tracking branch 'upstream/master' | Hongyu Chen | 2015-08-11 | |
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | | | ||||
| | | | * | | | Build file changes | Hongyu Chen | 2015-08-11 | |
| | * | | | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-10 | |
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||
* | | | | | | | move auth property iterator declaration into auth_context.h | yang-g | 2015-08-10 | |
| |_|_|/ / / |/| | | | | | ||||
| | | * | | | Merge branch 'master' into compression-accept-encoding | David Garcia Quintas | 2015-08-09 | |
| | | |\ \ \ | |_|_|/ / / |/| | | | | | ||||
| | | | * | | add protobuf.props to plugin projects | Jan Tattermusch | 2015-08-08 | |
| | | | * | | update instructions to build protoc plugins | Jan Tattermusch | 2015-08-08 | |
| | | | * | | update .props for protobuf | Jan Tattermusch | 2015-08-08 | |
| |_|_|/ / |/| | | | | ||||
| | * | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-07 | |
| | |\ \ \ | |_|/ / / |/| | | | | ||||
* | | | | | Merge github.com:grpc/grpc into kinetic-lopsided-poetry | Craig Tiller | 2015-08-06 | |
|\ \ \ \ \ | ||||
| | | * \ \ | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-06 | |
| | | |\ \ \ | | |_|/ / / | |/| | | | | ||||
| | * | | | | Regenerated Makefile | Robbie Shade | 2015-08-06 | |
| | |\ \ \ \ | | |/ / / / | |/| | | | | ||||
| * | | | | | Merge pull request #2750 from ctiller/propagate | Yang Gao | 2015-08-06 | |
| |\ \ \ \ \ | ||||
| | | * \ \ \ | Regenerated project files | Robbie Shade | 2015-08-06 | |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | ||||
| * | | | | | | Merge pull request #2781 from yang-g/stuboptions | Abhishek Kumar | 2015-08-05 | |
| |\ \ \ \ \ \ | ||||
* | | | | | | | | Merge github.com:grpc/grpc into kinetic-lopsided-poetry | Craig Tiller | 2015-08-05 | |
|\| | | | | | | | ||||
| * | | | | | | | Merge pull request #2797 from jtattermusch/polishing_api | Jan Tattermusch | 2015-08-05 | |
| |\ \ \ \ \ \ \ | ||||
| | | | | | * \ \ | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-05 | |
| | | | | | |\ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | ||||
| | | | * | | | | | Merge github.com:grpc/grpc into propagate | Craig Tiller | 2015-08-05 | |
| | | | |\ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | ||||
| * | | | | | | | | Merge pull request #2656 from yang-g/reconnect_branch_based_on_jitter | Vijay Pai | 2015-08-05 | |
| |\ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | updated .gitignore | Jan Tattermusch | 2015-08-04 | |
| | | | | | | | | * | merge with upstream/master | Alistair Veitch | 2015-08-04 | |
| | | | | | | | | |\ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | ||||
* | | / | | | | | | | Testing port server | Craig Tiller | 2015-08-04 | |
| |_|/ / / / / / / |/| | | | | | | | | ||||
| | | | * | | | | | Add proxy tests to end2end suite | Craig Tiller | 2015-08-04 | |
| |_|_|/ / / / / |/| | | | | | | | ||||
| | | * | | | | | Add StubOptions | yang-g | 2015-08-03 | |
| |_|/ / / / / |/| | | | | | | ||||
| | | | * | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-03 | |
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | | | ||||
| | * | | | | | merge with head and resolve conflicts | yang-g | 2015-08-03 | |
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||
| * | | | | | | Merge github.com:grpc/grpc into plucking-hell | Craig Tiller | 2015-08-01 | |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||
| | | | * | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-07-31 | |
| | | | |\ \ \ | ||||
| | | | * | | | | Add zookeeper end-to-end test | Hongwei Wang | 2015-07-31 | |
* | | | | | | | | Merge github.com:grpc/grpc into yeah-we-know-what-youre-talking-about | Craig Tiller | 2015-07-31 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | ||||
| | * | | | | | | Merge github.com:grpc/grpc into plucking-hell | Craig Tiller | 2015-07-31 | |
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||
| * | | | | | | | Merge pull request #2731 from nicolasnoble/regen-and-vs-tweaks | Jan Tattermusch | 2015-07-30 | |
| |\ \ \ \ \ \ \ | ||||
| | * | | | | | | | Regenerating project files and massaging VS project files. | Nicolas Noble | 2015-07-30 | |
| | | * | | | | | | Merge github.com:grpc/grpc into plucking-hell | Craig Tiller | 2015-07-30 | |
| | | |\ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | ||||
| | | * | | | | | | Merge branch 'regen-and-vs-tweaks' of github.com:nicolasnoble/grpc into tepid... | Craig Tiller | 2015-07-30 | |
| | | |\ \ \ \ \ \ | ||||
| | | | * | | | | | | Regenerating project files and massaging VS project files. | Nicolas Noble | 2015-07-31 | |
| | | |/ / / / / / | | |/| | | | | | | ||||
| * | | | | | | | | merge with master, fix build issue | Alistair Veitch | 2015-07-30 | |
| * | | | | | | | | Merge branch 'master' into issue_2709 | Alistair Veitch | 2015-07-30 | |
| |\ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | Move grpc_census_call_*_context calls into public header | Alistair Veitch | 2015-07-30 |