Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into slice | yang-g | 2016-07-12 |
|\ | |||
| * | Merge pull request #7219 from jcanizales/merge-0.14-into-master | makdharma | 2016-07-08 |
| |\ | | | | | | | Merge 0.14 into master | ||
| * \ | Merge branch 'master' of github.com:grpc/grpc into bb_reader_error | David Garcia Quintas | 2016-07-06 |
| |\ \ | |||
| | * \ | Merge pull request #7174 from dgquintas/remove_unused_status_code_enum_file | Nicolas Noble | 2016-07-06 |
| | |\ \ | | | | | | | | | | | removed unused version of status_code_enum.h | ||
| | * | | | Expunge all references to zookeeper | Craig Tiller | 2016-07-01 |
| | | | | | |||
| * | | | | updated copyright | David Garcia Quintas | 2016-06-30 |
| | | | | | |||
| * | | | | Return success status of grpc_byte_buffer_reader | David Garcia Quintas | 2016-06-30 |
| |/ / / | |||
| | | * | Merge master into merge-0.14-into-master | Jorge Canizales | 2016-06-30 |
| | | |\ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: - gRPC.podspec - Only had non-trivial changes in the core file list, which will need to be regenerated (in gRPC-Core.podspec). - src/objective-c/BoringSSL.podspec - Had trivial conflicts in the version. - src/objective-c/examples/RemoteTestClient/RemoteTest.podspec - Trivial conflicts in quoting. - src/objective-c/examples/Sample/Sample.xcodeproj/project.pbxproj and src/objective-c/examples/SwiftSample/SwiftSample.xcodeproj/project.pbxproj - The master version is used, pending testing. The 0.14 version had emoji and some unneeded entries. - src/objective-c/tests/Podfile - Added CronetFramework pod, and warning silencing from master. - templates/gRPC.podspec.template - Deleted. - third_party/protobuf - Using master commit, but need to verify if it works for frameworks. | ||
| | * | | removed unused version of status_code_enum.h | David Garcia Quintas | 2016-06-30 |
| |/ / | |||
| * | | Merge github.com:grpc/grpc into reuse_port | Craig Tiller | 2016-06-26 |
| |\ \ | |||
| | * \ | Merge pull request #6803 from sreecha/epoll_changes | Craig Tiller | 2016-06-25 |
| | |\ \ | | | | | | | | | | | New epoll based polling implementation | ||
* | | | | | Add API to get c slice from c++ Slice. | yang-g | 2016-06-24 |
| | | | | | |||
| | * | | | Merge pull request #6947 from vjpai/async_stream_doc | Jan Tattermusch | 2016-06-24 |
| |/| | | |/| | | | | | | | | | Doc Fixit: Ordering and thread-safety for C++ streaming (sync/async) APIs | ||
| | | * | | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-23 |
| | | |\ \ | |_|_|/ / |/| | | | | |||
* | | | | | Const correctness for ClientContext and ServerContext getters | Bill Clarke | 2016-06-22 |
| | | | | | |||
| | * | | | Properly handle reviewer comment re concurrent Read | vjpai | 2016-06-21 |
| | | | | | |||
| | * | | | Fix review comments | vjpai | 2016-06-21 |
| | | | | | |||
| | * | | | Merge branch 'master' into async_stream_doc | vjpai | 2016-06-21 |
| | |\ \ \ | |_|/ / / |/| | | | | |||
| | | * | | Merge branch 'master' into epoll_changes_merged | Sree Kuchibhotla | 2016-06-21 |
| | | |\ \ | |_|_|/ / |/| | | | | |||
| * | | | | Merge github.com:grpc/grpc into reuse_port | Craig Tiller | 2016-06-20 |
| |\ \ \ \ | |/ / / / |/| | | | | |||
* | | | | | Merge pull request #6352 from ctiller/error | Jan Tattermusch | 2016-06-17 |
|\ \ \ \ \ | | | | | | | | | | | | | Unifying error handling within core | ||
* | | | | | | Stop using global namespace on a template param | vjpai | 2016-06-17 |
| | | | | | | |||
| | | * | | | Add proper documentation of ordering and thread-safety for | vjpai | 2016-06-17 |
| | | | | | | | | | | | | | | | | | | | | | | | | streaming (sync and async) APIs | ||
| * | | | | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-16 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||
| | | | * | | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-16 |
| | | | |\ \ | | | |_|/ / | | |/| | | | |||
* | | | | | | Digraph | Vijay Pai | 2016-06-16 |
| | | | | | | |||
* | | | | | | Merge branch 'master' into wheezy | Vijay Pai | 2016-06-15 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||
* | | | | | | clang-format | Vijay Pai | 2016-06-15 |
| | | | | | | |||
| * | | | | | Merge pull request #6334 from tberghammer/android-64bit | Nicolas Noble | 2016-06-15 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add 64bit Android support | ||
* | | | | | | | Deal with to_string, proper usage of nullptr, and lack of map::emplace | Vijay Pai | 2016-06-15 |
| | | | | | | | |||
* | | | | | | | Provide nullptr->std::function cast | Vijay Pai | 2016-06-15 |
| | | | | | | | |||
| | | * | | | | Merge branch 'idempotent_endpoint_shutdown' into handshake_timeout | Craig Tiller | 2016-06-15 |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| * | | | | | | Merge pull request #6875 from y-zeng/log_check | Jan Tattermusch | 2016-06-14 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add format check for gpr_log and gpr_asprintf, add gpr_strpad | ||
| * | | | | | | | Added to server's shutdown docstrings | David Garcia Quintas | 2016-06-13 |
| | | | | | | | | |||
| | | | | | * | | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-13 |
| | | | | | |\ \ | | |_|_|_|_|/ / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #6438 from y-zeng/reflection_separate_lib | Jan Tattermusch | 2016-06-13 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Proto server reflection | ||
* | | | | | | | | | Manual clang-format | vjpai | 2016-06-13 |
| | | | | | | | | | |||
| | | * | | | | | | Fix gpr_log format mismatches in c++ tests | Yuchen Zeng | 2016-06-10 |
| | | | | | | | | | |||
| | | * | | | | | | Restricted the check to GUNC | Yuchen Zeng | 2016-06-10 |
| | | | | | | | | | |||
* | | | | | | | | | Switch server builder plugin API to something that will work with gcc4.4 | Vijay Pai | 2016-06-10 |
| | | | | | | | | | |||
| | | * | | | | | | Add format check for gpr_log and gpr_asprintf | Yuchen Zeng | 2016-06-10 |
| | |/ / / / / / | |/| | | | | | | |||
* | | | | | | | | override->GRPC_OVERRIDE | Vijay Pai | 2016-06-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove range-based fors | ||
| | | | | | * | | Add an API at the core level to disable signals or use a different | Sree Kuchibhotla | 2016-06-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | signal number | ||
| | | | | | * | | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-09 |
| | | | | | |\ \ | | |_|_|_|_|/ / | |/| | | | | | | |||
| | | | | | * | | Check epoll is actually available. set GPR_LINUX_EPOLL only in GLIBC ver | Sree Kuchibhotla | 2016-06-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.9 and above | ||
| | | | * | | | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-09 |
| | | | |\ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||
| | | | | | | * | Add modulemap for gRPC core | Jorge Canizales | 2016-06-08 |
| | | | | | | | | |||
| * | | | | | | | Merge pull request #6481 from dgquintas/compression_md_level_bis | Jan Tattermusch | 2016-06-08 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Allow servers to select compression level via initial MD & overall compression cleanup | ||
| * | | | | | | | | Merge pull request #6610 from xyzzyz/external_fd_fresh | Jan Tattermusch | 2016-06-08 |
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for communication using existing FD (for client and server) | ||
| | | | | | | * | | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-08 |
| | | | | | | |\ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | |