Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #6915 from markdroth/filter_api | kpayson64 | 2016-08-05 |
|\ | |||
* | | Reducing diff. | Nicolas "Pixel" Noble | 2016-08-05 |
* | | That won't work properly. Falling back on fixing the list of dependencies. | Nicolas "Pixel" Noble | 2016-08-05 |
* | | Using the interop dependencies instead. | Nicolas "Pixel" Noble | 2016-08-05 |
* | | Hopefully fixing #7639. | Nicolas "Pixel" Noble | 2016-08-05 |
* | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-08-04 |
|\ \ | |||
| * \ | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | Nicolas "Pixel" Noble | 2016-08-03 |
| |\ \ | |||
| * \ \ | Merge pull request #7554 from muxi/fix-cronet-interop-test | Muxi Yan | 2016-08-02 |
| |\ \ \ | |||
| * \ \ \ | Merge pull request #7370 from rjshade/move_timeout_encoding | kpayson64 | 2016-08-02 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge pull request #7254 from nicolasnoble/gcloud-no-image-aliases | Nicolas Noble | 2016-08-02 |
| |\ \ \ \ \ | |||
| | | | | | * | Merge remote-tracking branch 'upstream/master' into filter_api | Mark D. Roth | 2016-08-02 |
| | | | | | |\ | | |_|_|_|_|/ | |/| | | | | | |||
| * | | | | | | Merge pull request #7600 from dgquintas/fix_includes | Nicolas Noble | 2016-08-02 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge pull request #6774 from a-veitch/add_resource | kpayson64 | 2016-08-02 |
| |\ \ \ \ \ \ \ | |||
| | | | | | | * \ | Merge pull request #7610 from kpayson64/downgrade_setuptools | kpayson64 | 2016-08-02 |
| | | | | | | |\ \ | |||
| * | | | | | | \ \ | Merge pull request #7024 from markdroth/filter_call_init_failure | kpayson64 | 2016-08-02 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #7601 from dgquintas/census_stuff | kpayson64 | 2016-08-02 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | * | | Downgrade docker setuptools | Ken Payson | 2016-08-02 |
| | | | | | | | * | | | | Fix Jenkins test error | Muxi Yan | 2016-08-02 |
| | | | | | | | | | | * | Merge branch 'filter_call_init_failure' into filter_api | Mark D. Roth | 2016-08-02 |
| | | | | | | | | | | |\ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |||
| | | * | | | | | | | | | Ran generate_projects.sh. | Mark D. Roth | 2016-08-02 |
| | | * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into filter_call_init_failure | Mark D. Roth | 2016-08-02 |
| | | |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-08-02 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | * \ \ | Merge pull request #7580 from jtattermusch/netcore_nuget_to_rtm | Jan Tattermusch | 2016-08-02 |
| | | | | | | | | | |\ \ \ | | | | | | | | | | | |/ / | | | | | | | | | | |/| | | |||
| | * | | | | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-08-01 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | | Merge pull request #7602 from kpayson64/downgrade_setuptools.py | kpayson64 | 2016-08-01 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | | Downgrade docker setuptools | Ken Payson | 2016-08-01 |
| | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |||
| | | | * | | | | | | | | | Changed census static metadata keys for tracing and tag propagation | David Garcia Quintas | 2016-08-01 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||
| | | | | | * | | | | | | fixed include guard script and faulty .h | David Garcia Quintas | 2016-08-01 |
| * | | | | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into lr_july_16 | David Garcia Quintas | 2016-08-01 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | |||
| | | | * | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-08-01 |
| | | | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | |||
| | | | | | | | | | * | | build everything | Jan Tattermusch | 2016-07-31 |
| | * | | | | | | | | | | Merge pull request #7553 from podsvirov/topic-cmake-template | Nicolas Noble | 2016-07-29 |
| | |\ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | * | | | Bumping to 1.0.0-pre2. | Nicolas "Pixel" Noble | 2016-07-29 |
| | * | | | | | | | | | | | Merge branch 'v1.0.x' into manual-upmerge | Nicolas "Pixel" Noble | 2016-07-29 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | |||
| | | | | | | | | | * | | | Merge pull request #7567 from murgatroid99/node_artifact_build_health_check | Nicolas Noble | 2016-07-29 |
| | | | |_|_|_|_|_|/| | | | | | |/| | | | | | | | | | |||
| | | * | | | | | | | | | | update to use new nuget client in tests | Alexander Polcyn | 2016-07-28 |
| | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |||
| | | | | | | | | | * | | Build the Node health-check package in the build_packages script | murgatroid99 | 2016-07-28 |
| | | | |_|_|_|_|_|/ / | | | |/| | | | | | | | |||
| | | | * | | | | | | | CMake: Installation and Export Configuration | Konstantin Podsvirov | 2016-07-28 |
| | | |/ / / / / / / | | |/| | | | | | | | |||
* | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-07-27 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||
| | | * | | | | | | | regenerate from template | Stanley Cheung | 2016-07-26 |
| | | * | | | | | | | fix copyright | Stanley Cheung | 2016-07-26 |
| | | * | | | | | | | php: add php7 to jenkins basic and interop tests | Stanley Cheung | 2016-07-26 |
| | | * | | | | | | | php: remove protobuf-php clone hack | Stanley Cheung | 2016-07-26 |
| | | * | | | | | | | remove outdated php dockerfile dependency | Stanley Cheung | 2016-07-26 |
| | | | | | | | * | | Merge branch 'master' into move_timeout_encoding | Robbie Shade | 2016-07-26 |
| | | | | | | | |\ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||
| * | | | | | | | | | Merge pull request #7512 from stanley-cheung/php-cleanup-dockerfile | kpayson64 | 2016-07-25 |
| |\ \ \ \ \ \ \ \ \ | |||
* | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-07-25 |
|\| | | | | | | | | | | |||
| * | | | | | | | | | | Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_master | Nicolas Noble | 2016-07-25 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge pull request #7451 from y-zeng/seperate_generated_files | kpayson64 | 2016-07-25 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| | | | * | | | | | | | | | fix copyright | Stanley Cheung | 2016-07-25 |