Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Revert "Remove lockfree-stack implementation that is no longer used" | Ken Payson | 2017-07-10 |
| | | | | This reverts commit 3d04e025bcffd1e583d502de4ee26625ea866b21. | ||
* | Merge pull request #11602 from muxi/add_cancel_after_round_trip_test | Muxi Yan | 2017-07-05 |
|\ | | | | | Add a end2end test of cancel call | ||
* \ | Merge pull request #11582 from jtattermusch/cmake_various_fixes | Jan Tattermusch | 2017-07-03 |
|\ \ | | | | | | | cmake: various fixes | ||
* | | | Make CMake find_package work for preinstalled libprotobuf on Raspbian. | Kamil Skalski | 2017-06-28 |
| | | | |||
| | * | Add test | Muxi Yan | 2017-06-23 |
| |/ |/| | |||
| * | regenerate | Jan Tattermusch | 2017-06-23 |
| | | |||
| * | regenerate | Jan Tattermusch | 2017-06-23 |
| | | |||
| * | build protobuf without zlib | Jan Tattermusch | 2017-06-23 |
| | | |||
| * | workaround zlib cmake issue | Jan Tattermusch | 2017-06-23 |
|/ | |||
* | Remove lockfree-stack implementation that is no longer used | Vijay Pai | 2017-06-19 |
| | |||
* | Merge pull request #10075 from ↵ | Jan Tattermusch | 2017-06-19 |
|\ | | | | | | | | | emmenlau/emmenlau_add_dependency_to_libgrpc_where_missing Add grpc dependency where grpc++ is used | ||
* \ | Merge pull request #11140 from randomguy3/cmake-install | Jan Tattermusch | 2017-06-19 |
|\ \ | | | | | | | Fix CMake installation issues | ||
| | * | regenerate projects | Jan Tattermusch | 2017-06-19 |
| |/ |/| | |||
* | | Merge pull request #11469 from jtattermusch/cmake_explicit_protoc | Jan Tattermusch | 2017-06-19 |
|\ \ | | | | | | | Explicitly use built protoc for CMake build | ||
* | | | cmake: add zlib and cares dep | Jan Tattermusch | 2017-06-13 |
| | | | |||
| * | | explicitly use built protoc for CMake build | Jan Tattermusch | 2017-06-13 |
|/ / | |||
* | | Merge pull request #11336 from ctiller/ALL-the-things | Craig Tiller | 2017-06-08 |
|\ \ | | | | | | | Roll-up of threading changes | ||
* \ \ | Merge pull request #11237 from y-zeng/srv_record | Yuchen Zeng | 2017-06-08 |
|\ \ \ | | | | | | | | | Support grpclb address in the c-ares resolver | ||
| | * \ | Merge github.com:grpc/grpc into ALL-the-things | Craig Tiller | 2017-06-08 |
| | |\ \ | |_|/ / |/| | | | |||
* | | | | fix remaining license notices | Jan Tattermusch | 2017-06-08 |
| | | | | |||
| | * | | Merge github.com:grpc/grpc into ALL-the-things | Craig Tiller | 2017-06-07 |
| | |\ \ | |_|/ / |/| | | | |||
* | | | | Implement LB policy updates | David Garcia Quintas | 2017-06-06 |
| | | | | |||
| * | | | Merge remote-tracking branch 'upstream/master' into srv_record | Yuchen Zeng | 2017-06-06 |
| |\ \ \ | |/ / / |/| | | | |||
| * | | | Fix windows build, no_logging tests, dns_resolver_test | Yuchen Zeng | 2017-06-05 |
| | | | | |||
| | * | | Merge branch 'selectivity' into ALL-the-things | Craig Tiller | 2017-06-02 |
| | |\ \ | |_|/ / |/| | | | |||
* | | | | master bumped to 1.5.x | David Garcia Quintas | 2017-05-30 |
| | | | | |||
* | | | | Merge pull request #11309 from murgatroid99/master_1.3.x_upmerge | Michael Lumish | 2017-05-30 |
|\ \ \ \ | | | | | | | | | | | Master 1.3.x upmerge | ||
| | | * | | Merge branch 'thread_pool' into ALL-the-things | Craig Tiller | 2017-05-30 |
| |_|/| | |/| | | | | |||
| * | | | | Merge remote-tracking branch 'upstream/v1.3.x' into master_1.3.x_upmerge | murgatroid99 | 2017-05-25 |
| |\ \ \ \ | |||
| | | | * \ | Merge github.com:grpc/grpc into thread_pool | Craig Tiller | 2017-05-23 |
| | | | |\ \ | | |_|_|/ / | |/| | | | | |||
* | | | | | | Merge branch 'master' of https://github.com/Vizerai/grpc into intrusive_hash_map | Vizerai | 2017-05-23 |
|\| | | | | | |||
| | * | | | | bump version to 1.3.6 | Jan Tattermusch | 2017-05-23 |
| | | | | | | |||
| | * | | | | Update version to 1.3.5 | Ken Payson | 2017-05-19 |
| | | | | | | |||
| * | | | | | regenerate project | yang-g | 2017-05-19 |
| | |/ / / | |/| | | | |||
| | * | | | Merge pull request #11225 from apolcyn/bump_13x_version | apolcyn | 2017-05-18 |
| | |\ \ \ | | | | | | | | | | | | | Bump to version 1.3.4 | ||
| | * \ \ \ | Merge pull request #10813 from apolcyn/fix_conn_watch_mem_accum | apolcyn | 2017-05-18 |
| | |\ \ \ \ | | | | | | | | | | | | | | | get rid of connectivity state watchers right after timeout | ||
| | | * | | | | get rid of connectivity state watchers right after timeout | Alexander Polcyn | 2017-05-18 |
| | | | | | | | |||
| | | | * | | | Bump to version 1.3.4 | Alexander Polcyn | 2017-05-18 |
| | | |/ / / | | |/| | | | |||
| | | | * | | Merge github.com:grpc/grpc into thread_pool | Craig Tiller | 2017-05-17 |
| | | | |\ \ | | |_|_|/ / | |/| | | | | |||
| * | | | | | Merge pull request #11113 from jtattermusch/python_artifact_polling_trace | Jan Tattermusch | 2017-05-17 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Try fixing python artifact build on Windows | ||
| | | | | * \ | Merge github.com:grpc/grpc into thread_pool | Craig Tiller | 2017-05-16 |
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | | | |||
| | * | | | | | regenerate projects | Jan Tattermusch | 2017-05-16 |
| | | | | | | | |||
| | | * | | | | Bump to version 1.3.3 | Ken Payson | 2017-05-16 |
| | | | | | | | |||
| * | | | | | | Move workaround_list to grpc_base | Muxi Yan | 2017-05-15 |
| | | | | | | | |||
| | | | | | * | Set gRPC_INSTALL to ON by default for MSVC and OFF if a subproject | Alex Merry | 2017-05-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that gRPC_INSTALL is forced off if using bundled third-party libraries, it no longer makes sense to set it OFF by default for MSVC. However, we do want to set it OFF by default if gRPC is being built as a subproject of another project. | ||
| | | | | | * | CMake: Disable installation when using bundled third party libraries | Alex Merry | 2017-05-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If gRPC is not getting its (link-time) dependencies from the system, it should not be attempting installation. | ||
| | | | | | * | Revert "cmake: fix #8729" | Alex Merry | 2017-05-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c019e057c20db0b9c9a2f76fb0b9cd6f44addf92. | ||
| | | | | | * | Fix finding c-ares in package mode with CMake | Alex Merry | 2017-05-15 |
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | The next release of c-ares will install a CMake package (when built using CMake), but it will be called "c-ares", not "CARES". | ||
| * / | | | | Revert "Revert "Implement Server Backward Compatibility"" | Muxi Yan | 2017-05-15 |
| |/ / / / | |||
| * | | | | Revert "Implement Server Backward Compatibility" | Nicolas Noble | 2017-05-12 |
| | | | | |