Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #11310 from nicolasnoble/import | 2017-07-13 | |
|\ | |||
* | | Revert "Remove lockfree-stack implementation that is no longer used" | 2017-07-10 | |
| * | Merge branch 'master' of https://github.com/grpc/grpc into import | 2017-06-26 | |
| |\ | |/ |/| | |||
* | | Remove lockfree-stack implementation that is no longer used | 2017-06-19 | |
* | | Merge remote-tracking branch 'upstream/v1.4.x' into upmerge_1.4.x | 2017-06-15 | |
|\ \ | |||
* \ \ | Merge pull request #11336 from ctiller/ALL-the-things | 2017-06-08 | |
|\ \ \ | |||
* \ \ \ | Merge pull request #11237 from y-zeng/srv_record | 2017-06-08 | |
|\ \ \ \ | |||
| | * \ \ | Merge github.com:grpc/grpc into ALL-the-things | 2017-06-08 | |
| | |\ \ \ | |_|/ / / |/| | | | | |||
* | | | | | fix remaining license notices | 2017-06-08 | |
* | | | | | auto-fix most of licenses | 2017-06-08 | |
| | * | | | Merge github.com:grpc/grpc into ALL-the-things | 2017-06-07 | |
| | |\ \ \ | |_|/ / / |/| | | | | |||
* | | | | | Implement LB policy updates | 2017-06-06 | |
| * | | | | Merge remote-tracking branch 'upstream/master' into srv_record | 2017-06-06 | |
| |\ \ \ \ | |/ / / / |/| | | | | |||
| * | | | | Fix windows build, no_logging tests, dns_resolver_test | 2017-06-05 | |
| | * | | | Merge branch 'selectivity' into ALL-the-things | 2017-06-02 | |
| | |\ \ \ | |_|/ / / |/| | | | | |||
| | | | * | More layering. | 2017-06-02 | |
| | | | * | Better layering support for grpc++. | 2017-05-31 | |
* | | | | | master bumped to 1.5.x | 2017-05-30 | |
| | | * | | 1.4.x branch cut, version bump PR | 2017-05-30 | |
| |_|/ / |/| | | | |||
| | * | | Merge branch 'thread_pool' into ALL-the-things | 2017-05-30 | |
| |/| | |/| | | | |||
| | | * | Merge remote-tracking branch 'ctiller/build-wtf' into import | 2017-05-26 | |
| |_|/| |/| | | | |||
| | * | | Update BUILD | 2017-05-24 | |
| |/ / | |||
* | | | update | 2017-05-23 | |
* | | | Merge branch 'master' of https://github.com/Vizerai/grpc into intrusive_hash_map | 2017-05-23 | |
|\| | | |||
| * | | Upmerge from v1.3.x branch to master | 2017-05-17 | |
| |\ \ | |||
| * \ \ | Merge pull request #11113 from jtattermusch/python_artifact_polling_trace | 2017-05-17 | |
| |\ \ \ | |||
| | * | | | fix python artifact build | 2017-05-16 | |
| | | * | | Bump to version 1.3.3 | 2017-05-16 | |
| * | | | | Fix bazel build | 2017-05-15 | |
| |/ / / | |||
| | | * | Add language where it was missing to BUILD file | 2017-05-15 | |
| | |/ | |/| | |||
| * | | Eliminate grpc_cc_libraries | 2017-05-15 | |
| * | | Merge branch 'master' of https://github.com/grpc/grpc into import | 2017-05-12 | |
| |\ \ | |||
| * | | | Fixing mock test target. | 2017-05-12 | |
| * | | | Broken merge: missed a few new libraries. | 2017-05-12 | |
| * | | | Merge failure - forgot grpc_generate_one_off_targets | 2017-05-12 | |
| * | | | Merge failure - duplicated external_deps. | 2017-05-12 | |
| | * | | Attempted fix | 2017-05-11 | |
| * | | | Merge branch 'master' of https://github.com/grpc/grpc into import | 2017-05-11 | |
| |\| | | |||
| * | | | Disabling c-ares. | 2017-05-11 | |
| | | * | Fixed BUILD as well | 2017-05-10 | |
| | * | | Fix BUILD | 2017-05-10 | |
| | * | | Add missing file to BUILD | 2017-05-09 | |
| | * | | Merge branch 'cq_limited_pollers' of github.com:sreecha/grpc into uberpoll | 2017-05-05 | |
| | |\ \ | |||
| | * | | | Fix deps between grpc and tracer system | 2017-05-05 | |
| | * | | | Merge branch 'epoll_thread_pool' of github.com:sreecha/grpc into uberpoll | 2017-05-05 | |
| | |\ \ \ | |||
| | * \ \ \ | Merge branch 'timer_pool' of github.com:ctiller/grpc into uberpoll | 2017-05-05 | |
| | |\ \ \ \ | |||
| | * \ \ \ \ | Merge branch 'epex4' into uberpoll | 2017-05-05 | |
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||
| | | | * | | | Fix BUILD | 2017-05-04 | |
| | | |/ / / | | |/| | | | |||
| | | | | * | Update version to 1.3.1 | 2017-05-04 | |
| | | | * | | Merge branch 'master' into epoll_thread_pool | 2017-05-03 | |
| | | | |\ \ | | | |_|/ / | | |/| | | |