Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | | | | | | | * | | | | | | Colocate calls for the same channel on the same CQ | Craig Tiller | 2016-06-27 | |
| | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | * | Fix new test | Craig Tiller | 2016-06-27 | |
| | | | | | | | | | | | | | | ||||
| | | | | | * | | | | | | | | Resolved merge conflicts with master | murgatroid99 | 2016-06-27 | |
| | | | | | |\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | * | Merge github.com:grpc/grpc into %s | Craig Tiller | 2016-06-27 | |
| | | | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | fixes #3492 | Makarand Dharmapurikar | 2016-06-27 | |
| |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added a step in the documentation for objc | |||
| | | | | | | | * | | | | | fixes #7051 | Makarand Dharmapurikar | 2016-06-27 | |
| | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed return type to GRPCCall * from ProtoRPC * | |||
| * | | | | | / / / / / | Annotate more things | Craig Tiller | 2016-06-27 | |
|/ / / / / / / / / / / | ||||
* | | | | | | | | | | | Merge pull request #6644 from ctiller/reuse_port | Jan Tattermusch | 2016-06-27 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | SO_REUSEPORT support | |||
* | | | | | | | | | | | Merge pull request #7046 from murgatroid99/master_merge_release-0_15 | Jan Tattermusch | 2016-06-27 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | Merge release-0_15 into master | |||
| | | | | * | | | | | | Annotate error.c for timing, remove broken test | Craig Tiller | 2016-06-27 | |
| |_|_|_|/ / / / / / |/| | | | | | | | | | ||||
| | | | * | | | | | | printf portability sucks | David Garcia Quintas | 2016-06-27 | |
| | | | | | | | | | | ||||
| | | | | | | | * | | Build ObjC examples in travis | Yuchen Zeng | 2016-06-27 | |
| | | | | | | | | | | ||||
| | | | | | | | * | | Add .xcscheme files for ObjC examples | Yuchen Zeng | 2016-06-27 | |
| | | | | | | | | | | ||||
* | | | | | | | | | | Merge pull request #6973 from makdharma/network_status_change | Jan Tattermusch | 2016-06-27 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Network status tracking | |||
| | * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/release-0_15' into ↵ | murgatroid99 | 2016-06-27 | |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master_merge_release-0_15 | |||
| | | * \ \ \ \ \ \ \ \ | Merge pull request #7054 from jtattermusch/csharp_update_examples_to_0_15 | Jan Tattermusch | 2016-06-27 | |
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Update C# examples to 0.15.0 packages. | |||
| | | | | | | | | | | | * | Merge github.com:grpc/grpc into %s | Craig Tiller | 2016-06-27 | |
| | | | | | | | | | | | |\ | ||||
* | | | | | | | | | | | | \ | Merge pull request #7001 from kpayson64/python_cleanup_thread | Jan Tattermusch | 2016-06-27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated several threads to use CleanupThread for clean exit | |||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #6888 from yang-g/fixes | Jan Tattermusch | 2016-06-27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | Minor fixes | |||
* | | | | | | | | | | | | | | | Merge pull request #7027 from ctiller/faster_runtests | Jan Tattermusch | 2016-06-27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove caching of results by run_tests | |||
| * | | | | | | | | | | | | | | | \o/ Python | Craig Tiller | 2016-06-27 | |
| | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | Updated several threads to use CleanupThread for clean exit | Ken Payson | 2016-06-26 | |
| | | | | | | | | | | | | | | | | ||||
| | | | | | | | | * | | | | | | | Add a unit test for compression. | yang-g | 2016-06-26 | |
| |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | Merge pull request #7072 from ctiller/fix_perf_trace | Craig Tiller | 2016-06-26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GPR_TIMER misbalancing | |||
| * | | | | | | | | | | | | | | | Fix GPR_TIMER misbalancing | Craig Tiller | 2016-06-26 | |
|/ / / / / / / / / / / / / / / | ||||
| | | | | | | | * | | | | | | | Merge github.com:grpc/grpc into reuse_port | Craig Tiller | 2016-06-26 | |
| | | | | | | | |\ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | Merge pull request #7063 from dgquintas/python_compression | Jan Tattermusch | 2016-06-25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basic testing of client and sever side compression for Python | |||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #6941 from kpayson64/python_grpc_shutdown | Jan Tattermusch | 2016-06-25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved grpc_shutdown to end of Py_Finalize() | |||
| | | | | | | | * \ \ \ \ \ \ \ \ | Merge pull request #7049 from kpayson64/clang_format_0_15 | Jan Tattermusch | 2016-06-25 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix clang formatting | |||
* | | | | | | | | \ \ \ \ \ \ \ \ \ | Merge pull request #6906 from makdharma/2646 | Jan Tattermusch | 2016-06-25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass NULL in the host parameter of grpc_channel_create_call | |||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #7043 from kpayson64/clang_format | Jan Tattermusch | 2016-06-25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix clang formatting | |||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #6803 from sreecha/epoll_changes | Craig Tiller | 2016-06-25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | New epoll based polling implementation | |||
| | | | | | | | | | | | | | | | | | * | | Fix InteropTests.m | Yuchen Zeng | 2016-06-24 | |
| | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | * | | | | | | | | | Merge pull request #7064 from jtattermusch/fix_ruby_package_build | Jan Tattermusch | 2016-06-24 | |
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix building ruby package | |||
| | | | | * | | | | | | | | | | | | | | | | Basic testing of client and sever side compression | David Garcia Quintas | 2016-06-24 | |
| | | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | * | | | | | | | | | fix building ruby package | Jan Tattermusch | 2016-06-24 | |
| | | | | | | | | | | |/ / / / / / / / / | ||||
| | | | | | * | | | | | | | | | | | | | | Fix sanity | Craig Tiller | 2016-06-24 | |
| | | | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | | Merge pull request #6798 from jboeuf/fix_3803 | Jan Tattermusch | 2016-06-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #3803 | |||
| | | * | | | | | | | | | | | | | | | | | | Fix clang formatting | Ken Payson | 2016-06-24 | |
| | | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | | * | | | | | | | regenerate files | Jan Tattermusch | 2016-06-24 | |
| | | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | | * | | | | | | | update grpc nugets to 0.15 | Jan Tattermusch | 2016-06-24 | |
| | | | | | | | | | | | | |/ / / / / / / | | | | | | | | | | | | |/| | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | | Merge pull request #7014 from ctiller/fix_tracing | Jan Tattermusch | 2016-06-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable accidentally disabled traces | |||
| | | | | | | | | | | | | | | | | | | | * | Merge branch 'faster_runtests' into %s | Craig Tiller | 2016-06-24 | |
| | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | | | | | | |/| | | | | | | | | | | | | ||||
| | | | | | | | * | | | | | | | | | | | | | Fix bad indentation | Craig Tiller | 2016-06-24 | |
| | | | | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #7029 from y-zeng/fix-swiftsample | makdharma | 2016-06-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build error of SwiftSample project on Xcode 7.3 (Swift 2.2) | |||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #6934 from makdharma/route_guide_fixes | makdharma | 2016-06-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | Modified route_guide sample app to show RPC log | |||
| | | | | | | | | | | | | | | * | | | | | | | Fix clang formatting | Ken Payson | 2016-06-24 | |
| | | | | | | | | | | | | | |/ / / / / / / | ||||
| | | | | | | | | | | | | * / / / / / / / | Merge release-0_15 into master | murgatroid99 | 2016-06-24 | |
| |_|_|_|_|_|_|_|_|_|_|_|/| | | | | | | | |/| | | | | | | | | | | | |/ / / / / / / | ||||
| | | | | | | | | | | | | | | | | | | * | Fixes | Craig Tiller | 2016-06-24 | |
| | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | * | | | | | | | Merge pull request #7040 from murgatroid99/release_version_0.15.0 | Jan Tattermusch | 2016-06-24 | |
| | | | | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update version to 0.15.0 |