Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'tsan-c++' into hybrid | Craig Tiller | 2017-04-20 |
|\ | |||
| * | Merge github.com:grpc/grpc into cpparena | Craig Tiller | 2017-04-19 |
| |\ | |||
| | * | Extend clang-format to C#, Node, Ruby | Craig Tiller | 2017-04-19 |
| | | | |||
| * | | Fix broken merge | Craig Tiller | 2017-04-19 |
| | | | |||
* | | | Fix typo | Craig Tiller | 2017-04-18 |
| | | | |||
* | | | Merge github.com:grpc/grpc into hybrid | Craig Tiller | 2017-04-14 |
|\ \ \ | | |/ | |/| | |||
| | * | Merge github.com:grpc/grpc into cpparena | Craig Tiller | 2017-04-14 |
| | |\ | | |/ | |/| | |||
| * | | Merge branch 'master' into cq_create_api_changes | Sree Kuchibhotla | 2017-04-13 |
| |\ \ | |||
| | * \ | Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_1.2.4 | murgatroid99 | 2017-04-13 |
| | |\ \ | |||
* | | \ \ | Merge github.com:grpc/grpc into hybrid | Craig Tiller | 2017-04-13 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| | * | | | Merge branch 'master' into cq_create_api_changes | Sree Kuchibhotla | 2017-04-13 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | | | * | Merge github.com:grpc/grpc into cpparena | Craig Tiller | 2017-04-12 |
| | | | |\ | | |_|_|/ | |/| | | | |||
* | | | | | Remove API | Craig Tiller | 2017-04-12 |
| |/ / / |/| | | | |||
| * | | | Merge remote-tracking branch 'upstream/v1.2.x' into HEAD | Jan Tattermusch | 2017-04-12 |
| |\ \ \ | |||
| | | * | | Only delete core-level server if shutdown was successful | murgatroid99 | 2017-04-11 |
| | | | | | |||
| | | * | | Node server: add NULL check to tryShutdown | murgatroid99 | 2017-04-11 |
| | | | | | |||
| | | * | | Move ForceShutdown completion handling to new OnComplete method | murgatroid99 | 2017-04-11 |
| | | | | | |||
| | | * | | Add native tag completion callbacks, dispose of server after tryShutdown ↵ | murgatroid99 | 2017-04-10 |
| | | | | | | | | | | | | | | | | | | | | succeeds | ||
| | | * | | Refactor tag completion handling into one function | murgatroid99 | 2017-04-10 |
| | |/ / | |||
| | * | | Merge pull request #10468 from murgatroid99/node_call_destruction_bug | Michael Lumish | 2017-04-06 |
| | |\ \ | | | | | | | | | | | Fix call destruction bug | ||
| | | * | | Node: consolidate call destruction logic | murgatroid99 | 2017-04-06 |
| | | | | | |||
* | | | | | Merge branch 'master' into cq_create_api_changes | Sree Kuchibhotla | 2017-04-06 |
|\| | | | | |||
| | * | | | Node: fix leak of sent metadata | murgatroid99 | 2017-04-06 |
| | | | | | |||
| | | | * | Merge github.com:grpc/grpc into cpparena | Craig Tiller | 2017-04-04 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | | * | | Fix call destruction bug | murgatroid99 | 2017-04-04 |
| | | | | | |||
| | * | | | Properly unref some slices in Node glue code | murgatroid99 | 2017-04-03 |
| | |/ / | |||
| * / / | Large message latency improvements: remove a memcpy and a Buffer construtor call | murgatroid99 | 2017-03-31 |
| |/ / | |||
| | * | Call ref/unref, bugfixes | Craig Tiller | 2017-03-31 |
| |/ | |||
* | | Merge branch 'master' into cq_create_api_changes | Sree Kuchibhotla | 2017-03-24 |
|\| | |||
* | | Node changes | Sree Kuchibhotla | 2017-03-22 |
| | | |||
| * | Drop support for io.js, fix minor issue with node extension | murgatroid99 | 2017-03-14 |
| | | |||
* | | Node: Completion queue API changes | Sree Kuchibhotla | 2017-03-03 |
|/ | |||
* | Merge remote-tracking branch 'upstream/v1.1.x' into merge_1.1.x_master | murgatroid99 | 2017-02-23 |
|\ | |||
| * | Fix segfault in Node server destructor | murgatroid99 | 2017-02-22 |
| | | |||
| * | Improve Node and libuv testing and test coverage | murgatroid99 | 2017-02-17 |
| | | | | | | | | Allow Node tests to run with or without UV, change default version to 7, add some portability tests. Also make some more core tests work with libuv | ||
* | | Merge remote-tracking branch 'google/v1.1.x' | Nicolas "Pixel" Noble | 2017-02-13 |
|\| | |||
| * | Node: refactor non-uv completion queue wrapping code | Michael Lumish | 2017-02-07 |
| | | |||
| * | Move parameters for all grpc_op types into their own sub-structs. | Mark D. Roth | 2017-01-28 |
| | | |||
* | | Fix merge error | Craig Tiller | 2017-01-26 |
| | | |||
* | | Fix merge error | Craig Tiller | 2017-01-26 |
| | | |||
* | | Fix merge error | Craig Tiller | 2017-01-26 |
| | | |||
* | | Merge github.com:grpc/grpc into rollfwd | Craig Tiller | 2017-01-26 |
|\ \ | |||
| * | | Move parameters for all grpc_op types into their own sub-structs. | Mark D. Roth | 2017-01-25 |
| |/ | |||
* | | Merge github.com:grpc/grpc into rollfwd | Craig Tiller | 2017-01-24 |
|\| | |||
| * | Merge pull request #9428 from grpc/revert-8842-metadata_filter | David G. Quintas | 2017-01-23 |
| |\ | | | | | | | Revert "Metadata handling rewrite" | ||
| * \ | v1.0.x → master upmerge | Nathaniel Manista | 2017-01-23 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Manual resolution: - Force use of local distributions in Python-building in tools/run_tests/helper_scripts/build_python.sh. | ||
* | | | | Revert "Revert "Metadata handling rewrite"" | Craig Tiller | 2017-01-23 |
| |_|/ |/| | | | | | | | | This reverts commit 5e01e2ac977655aa074faf7fde0a74298f5e4c55. | ||
* | | | Revert "Metadata handling rewrite" | Craig Tiller | 2017-01-20 |
|/ / | |||
* | | Merge github.com:grpc/grpc into metadata_filter | Craig Tiller | 2017-01-17 |
|\ \ | |||
* | | | Make Node extension work with slice changes | murgatroid99 | 2016-12-12 |
| | | |