Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into filter_api | 2016-08-02 | |
|\ | |||
| * | Merge pull request #7600 from dgquintas/fix_includes | 2016-08-02 | |
| |\ | |||
| * \ | Merge pull request #6774 from a-veitch/add_resource | 2016-08-02 | |
| |\ \ | |||
| * \ \ | Merge pull request #7024 from markdroth/filter_call_init_failure | 2016-08-02 | |
| |\ \ \ | |||
| * \ \ \ | Merge pull request #7601 from dgquintas/census_stuff | 2016-08-02 | |
| |\ \ \ \ | |||
* | \ \ \ \ | Merge branch 'filter_call_init_failure' into filter_api | 2016-08-02 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||
| * | | | | | Ran generate_projects.sh. | 2016-08-02 | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into filter_call_init_failure | 2016-08-02 | |
| |\| | | | | |||
| | * | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | 2016-08-01 | |
| | |\ \ \ \ | |||
| | | * \ \ \ | Merge pull request #7602 from kpayson64/downgrade_setuptools.py | 2016-08-01 | |
| | | |\ \ \ \ | |||
| | | | * | | | | Downgrade docker setuptools | 2016-08-01 | |
| | | | | * | | | Changed census static metadata keys for tracing and tag propagation | 2016-08-01 | |
| | | | |/ / / | | | |/| | | | |||
| | | | | | * | fixed include guard script and faulty .h | 2016-08-01 | |
| | | * | | | | Merge branch 'master' of github.com:grpc/grpc into lr_july_16 | 2016-08-01 | |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||
| | * | | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | 2016-08-01 | |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||
| | | * | | | | Merge pull request #7553 from podsvirov/topic-cmake-template | 2016-07-29 | |
| | | |\ \ \ \ | |||
| | | * \ \ \ \ | Merge branch 'v1.0.x' into manual-upmerge | 2016-07-29 | |
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||
| | | | * | | | | update to use new nuget client in tests | 2016-07-28 | |
| | | | | * | | | CMake: Installation and Export Configuration | 2016-07-28 | |
| | | | |/ / / | | | |/| | | | |||
| | | | * | | | regenerate from template | 2016-07-26 | |
| | | | * | | | fix copyright | 2016-07-26 | |
| | | | * | | | php: add php7 to jenkins basic and interop tests | 2016-07-26 | |
| | | | * | | | php: remove protobuf-php clone hack | 2016-07-26 | |
| | | | * | | | remove outdated php dockerfile dependency | 2016-07-26 | |
| | | * | | | | Merge pull request #7512 from stanley-cheung/php-cleanup-dockerfile | 2016-07-25 | |
| | | |\ \ \ \ | |||
| | | * \ \ \ \ | Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_master | 2016-07-25 | |
| | | |\ \ \ \ \ | |||
| | | * \ \ \ \ \ | Merge pull request #7451 from y-zeng/seperate_generated_files | 2016-07-25 | |
| | | |\ \ \ \ \ \ | |||
| | | | | | * | | | | fix copyright | 2016-07-25 | |
| | | * | | | | | | | Merge pull request #7395 from markdroth/handshake_api | 2016-07-25 | |
| | | |\ \ \ \ \ \ \ | |||
| | | | | | * | | | | | Fix merge again | 2016-07-25 | |
| | | | | | | * | | | | php: add php7 to jenkins basic and interop tests | 2016-07-23 | |
| | | | | | | * | | | | php: remove protobuf-php clone hack | 2016-07-22 | |
| | | | | | | * | | | | remove outdated php dockerfile dependency | 2016-07-22 | |
| | | | |_|_|/ / / / | | | |/| | | | | | | |||
| | | | | | * | | | | Fixed incorrect merges | 2016-07-22 | |
| | | | | | * | | | | Actually commit changes to tools/distrib/python/grpcio_tools/setup.py | 2016-07-22 | |
| | | | | | * | | | | Merge v1.0.x into master | 2016-07-22 | |
| | | | |_|/| | | | | | | |/| | |/ / / | |||
| | | | | | | | * | merge to upstream/master | 2016-07-21 | |
| | | | | | | | |\ | |||
| | | * | | | | | \ | Merge pull request #7269 from y-zeng/cli_call | 2016-07-21 | |
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||
| | | | | | | * | | | Merge pull request #7491 from kpayson64/remote_linux_whl_artifacts | 2016-07-21 | |
| | | | | | | |\ \ \ | |||
| | | | | | * | \ \ \ | Merge remote-tracking branch 'upstream/master' into seperate_generated_files | 2016-07-21 | |
| | | | | | |\ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | | | |||
| | | | | | | * | | | | Merge remote-tracking branch 'google/v1.0.x' into no_verbose_fix | 2016-07-21 | |
| | | | | | | |\ \ \ \ | |||
| | | | | | | | | * | | | Remove non-manylinux linux .whl artifacts | 2016-07-21 | |
| | | | | | | | * | | | | Merge pull request #7462 from ctiller/backport-delayed-write | 2016-07-21 | |
| | | | | | | | |\ \ \ \ | | | | | | | | | |/ / / | | | | | | | | |/| | | | |||
* | | | | | | | | | | | | Merge branch 'filter_call_init_failure' into filter_api | 2016-07-21 | |
|\| | | | | | | | | | | | |||
| | | * | | | | | | | | | Merge pull request #7465 from grpc/revert-6942-perf_html_report | 2016-07-21 | |
| | | |\ \ \ \ \ \ \ \ \ | |||
| * | | \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into filter_call_init_failure | 2016-07-21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | |||
| | | | | | | | | * | | | | Merge pull request #7484 from soltanmm/docgen-impro | 2016-07-21 | |
| | | | | | | | | |\ \ \ \ | |||
| | | | | | | | | | * | | | | Upgrade virtualenv pip in Python docgen | 2016-07-20 | |
| | | | | | | | | * | | | | | Correct shell scripting mistake in node package generation code | 2016-07-20 | |
| | | | | | | | | |/ / / / | |||
| | | | | | * | | | | | | | Merge remote-tracking branch 'upstream/master' into handshake_api | 2016-07-20 | |
| | | | | | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | |