Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #7602 from kpayson64/downgrade_setuptools.py | kpayson64 | 2016-08-01 |
|\ | |||
| * | Downgrade docker setuptools | Ken Payson | 2016-08-01 |
* | | Merge branch 'master' of github.com:grpc/grpc into lr_july_16 | David Garcia Quintas | 2016-08-01 |
|\ \ | |||
| * \ | Merge pull request #7553 from podsvirov/topic-cmake-template | Nicolas Noble | 2016-07-29 |
| |\ \ | |||
| * \ \ | Merge branch 'v1.0.x' into manual-upmerge | Nicolas "Pixel" Noble | 2016-07-29 |
| |\ \ \ | | |_|/ | |/| | | |||
| | * | | update to use new nuget client in tests | Alexander Polcyn | 2016-07-28 |
| | | * | CMake: Installation and Export Configuration | Konstantin Podsvirov | 2016-07-28 |
| | |/ | |/| | |||
| | * | 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 pull request #7512 from stanley-cheung/php-cleanup-dockerfile | kpayson64 | 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 |
| * | | | | | Merge pull request #7395 from markdroth/handshake_api | kpayson64 | 2016-07-25 |
| |\ \ \ \ \ | |||
| | | | * | | | Fix merge again | murgatroid99 | 2016-07-25 |
| | | | | * | | php: add php7 to jenkins basic and interop tests | Stanley Cheung | 2016-07-23 |
| | | | | * | | php: remove protobuf-php clone hack | Stanley Cheung | 2016-07-22 |
| | | | | * | | remove outdated php dockerfile dependency | Stanley Cheung | 2016-07-22 |
| | |_|_|/ / | |/| | | | | |||
| | | | * | | Fixed incorrect merges | murgatroid99 | 2016-07-22 |
| | | | * | | Actually commit changes to tools/distrib/python/grpcio_tools/setup.py | murgatroid99 | 2016-07-22 |
| | | | * | | Merge v1.0.x into master | murgatroid99 | 2016-07-22 |
| | |_|/| | | |/| | |/ | |||
| * | | | | Merge pull request #7269 from y-zeng/cli_call | kpayson64 | 2016-07-21 |
| |\ \ \ \ | |||
| | | | | * | Merge pull request #7491 from kpayson64/remote_linux_whl_artifacts | kpayson64 | 2016-07-21 |
| | | | | |\ | |||
| | | | * | \ | Merge remote-tracking branch 'upstream/master' into seperate_generated_files | Yuchen Zeng | 2016-07-21 |
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | |||
| | | | | * | | Merge remote-tracking branch 'google/v1.0.x' into no_verbose_fix | Nicolas "Pixel" Noble | 2016-07-21 |
| | | | | |\ \ | |||
| | | | | | | * | Remove non-manylinux linux .whl artifacts | Ken Payson | 2016-07-21 |
| | | | | | * | | Merge pull request #7462 from ctiller/backport-delayed-write | Nicolas Noble | 2016-07-21 |
| | | | | | |\ \ | | | | | | | |/ | | | | | | |/| | |||
| * | | | | | | | Merge pull request #7465 from grpc/revert-6942-perf_html_report | kpayson64 | 2016-07-21 |
| |\ \ \ \ \ \ \ | |||
| | | | | | | * \ | Merge pull request #7484 from soltanmm/docgen-impro | kpayson64 | 2016-07-21 |
| | | | | | | |\ \ | |||
| | | | | | | | * | | Upgrade virtualenv pip in Python docgen | Masood Malekghassemi | 2016-07-20 |
| | | | | | | * | | | Correct shell scripting mistake in node package generation code | murgatroid99 | 2016-07-20 |
| | | | | | | |/ / | |||
| | | | * | | | | | Merge remote-tracking branch 'upstream/master' into handshake_api | Mark D. Roth | 2016-07-20 |
| | | | |\ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||
| | | | | * | | | | Merge remote-tracking branch 'upstream/master' into seperate_generated_files | Yuchen Zeng | 2016-07-19 |
| | | | | |\ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||
| | | | | | | * | | Merge pull request #7397 from soltanmm/hua-tulyada-hua-wa-hua-HEY-Hey-hey-hey | kpayson64 | 2016-07-19 |
| | | | | | | |\ \ | |||
| | | | | | | * \ \ | Merge pull request #7424 from soltanmm/macverfix | kpayson64 | 2016-07-19 |
| | | | | | | |\ \ \ | |||
| | | | | | | | | * | | Document the custom grpcio-tools command class | Masood Malekghassemi | 2016-07-19 |
| * | | | | | | | | | | Merge pull request #7431 from thinkerou/fix_spell_error | kpayson64 | 2016-07-19 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | Add latency profiling from 'important' marks | Craig Tiller | 2016-07-19 |
| | | | | | * | | | | | | Fix sanity check | Yuchen Zeng | 2016-07-19 |
| | | * | | | | | | | | | Revert "Generate html report for perf tests" | Vijay Pai | 2016-07-19 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||
| | | | | | | | | | * | Merge pull request #6737 from ctiller/delayed-write | Craig Tiller | 2016-07-19 |
| | | | | | | | * | | | Force the Python host version on Mac OS X | Masood Malekghassemi | 2016-07-18 |
| | | | | | | | | |/ | | | | | | | | |/| | |||
| | | | | * | | / | | Separate generated file and protobuf dependency | Yuchen Zeng | 2016-07-18 |
| | |_|_|/ / / / / | |/| | | | | | | | |||
| | | | | | * | | | Polish grpcio_health_checking package | Ken Payson | 2016-07-18 |
| | | | | | |/ / | |||
| | | | | | * | | Merge pull request #7416 from soltanmm/3D | kpayson64 | 2016-07-18 |
| | | | | | |\ \ | |||
| * | | | | | \ \ | Merge pull request #6942 from adelez/perf_html_report | kpayson64 | 2016-07-18 |
| |\ \ \ \ \ \ \ \ | |||
| | | | | | * | | | | Make default log verbosity ERROR, run tests with DEBUG | Craig Tiller | 2016-07-18 |
| | | | | | | |_|/ | | | | | | |/| | |