Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #7308 from ctiller/moovee | Nicolas Noble | 2016-08-18 |
|\ | | | | | Prep for making GA video | ||
* \ | Merge pull request #7741 from nicolasnoble/manual-upmerge | Nicolas Noble | 2016-08-18 |
|\ \ | | | | | | | Manual upmerge from v1.0.x to master. | ||
* \ \ | Merge pull request #7735 from y-zeng/cli_main_fork | kpayson64 | 2016-08-17 |
|\ \ \ | | | | | | | | | Improve gRPC CLI | ||
* \ \ \ | Merge pull request #7594 from chedeti/grpc-thrift-v2 | kpayson64 | 2016-08-17 |
|\ \ \ \ | | | | | | | | | | | grpc thrift integration | ||
* \ \ \ \ | Merge pull request #7679 from stanley-cheung/fix-jenkins-linux-image | Stanley Cheung | 2016-08-17 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix jenkins linux image in create script | ||
* | | | | | | fix_interop_server_arg | Adele Zhou | 2016-08-16 |
| | | | | | | |||
* | | | | | | Merge pull request #7633 from thunderboltsid/add-pypy-to-testing-toolchain | kpayson64 | 2016-08-15 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | add PyPy to testing toolchain | ||
| | | | | * | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | Nicolas "Pixel" Noble | 2016-08-16 |
| |_|_|_|/| | |/| | | | | | | |||
| | | | * | | | Add CliCredentials, config_grpc_cli.h | Yuchen Zeng | 2016-08-15 |
| | | | | | | | |||
| | | | * | | | Merge remote-tracking branch 'upstream/master' into cli_main_fork | Yuchen Zeng | 2016-08-15 |
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | | | |||
| | | | | * | | Merge pull request #7717 from nicolasnoble/update-build-packages | Nicolas Noble | 2016-08-12 |
| | | | | |\ \ | | | | | | | | | | | | | | | | | Updating build package C# scripts. | ||
| | | | | | * | | There's no 'platform' in package_targets.py, only labels. | Nicolas "Pixel" Noble | 2016-08-12 |
| | | | | | | | | |||
| | | | | | * | | Updating build package C# scripts. | Nicolas "Pixel" Noble | 2016-08-12 |
| | | | | | | | | |||
| | | | | * | | | Don't get dependencies for Node grpc-health-check package build | murgatroid99 | 2016-08-11 |
| | | | | |/ / | |||
* | | | | | | | Merge branch 'v1.0.x' into manual-upmerge | Nicolas "Pixel" Noble | 2016-08-11 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||
* | | | | | | | Removed duplicated dependency for grpclb | David Garcia Quintas | 2016-08-09 |
| | | | | | | | |||
| | | | | | * | Merge github.com:grpc/grpc into moovee | Craig Tiller | 2016-08-09 |
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | | | |||
| * | | | | | | Merge pull request #7623 from apolcyn/sys_inter_with_nuget | Nicolas Noble | 2016-08-09 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Updating Ix-Async to System Interactive and nuget | ||
| * \ \ \ \ \ \ | Merge pull request #7605 from sreecha/perf-fix-ga | Nicolas Noble | 2016-08-09 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add clientSuccess and serverSuccess to BQ schema | ||
* | | | | | | | | | Extend the deadline of objc-examples-build to 30 minutes | Muxi Yan | 2016-08-09 |
| | | | | | | | | | |||
| | | | | * | | | | fix jenkins linux image in create script | Stanley Cheung | 2016-08-09 |
| |_|_|_|/ / / / |/| | | | | | | | |||
| * | | | | | | | 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 |
| | | | | | | | | |||
| * | | | | | | | Undo Go Docker fix - fixed in another PR | Jorge Canizales | 2016-08-05 |
| | | | | | | | | |||
| * | | | | | | | Merge commit '4e57e8be3911e3030e2ccfd6478be75a3c2b0250' into ↵ | Jorge Canizales | 2016-08-05 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | p0-advance-protobuf-version | ||
* | \ \ \ \ \ \ \ | Merge pull request #6915 from markdroth/filter_api | kpayson64 | 2016-08-05 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Implement C++ API for defining channel filters. | ||
* | | | | | | | | | | 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 |
| | | | | | | | | | | |||
| | | | | | | * | | | fix multilevel inheritence codegen | chedeti | 2016-08-05 |
| | | | | | | | | | | |||
* | | | | | | | | | | Using the interop dependencies instead. | Nicolas "Pixel" Noble | 2016-08-05 |
| | | | | | | | | | | |||
* | | | | | | | | | | Hopefully fixing #7639. | Nicolas "Pixel" Noble | 2016-08-05 |
| | | | | | | | | | | |||
| | | | | * | | | | | change location of nuget back to normal | Alexander Polcyn | 2016-08-05 |
| | | | | | | | | | | |||
| | | | | | | * | | | fix Dockerfile | chedeti | 2016-08-04 |
| | | | | | | | | | | |||
| | * | | | | | | | | @pgrosu’s fix of Go’s docker build | Jorge Canizales | 2016-08-04 |
| | | | | | | | | | | |||
| | | | | | * | | | | add PyPy to testing toolchain | siddharthshukla | 2016-08-04 |
| | | | | | | | | | | |||
| | | | | | | * | | | use boost::make_shared | chedeti | 2016-08-04 |
| | | | | | | | | | | |||
| | * | | | | | | | | Fix Jenkins test error | Muxi Yan | 2016-08-03 |
| | | | | | | | | | | |||
| | | | | | | * | | | sanity check for thrift | chedeti | 2016-08-03 |
| | | | | | | | | | | |||
| | | | | | | * | | | rename class variables to snake_case | chedeti | 2016-08-03 |
| | | | | | | | | | | |||
| | * | | | | | | | | Point out what to do if the sanity check fails | Jorge Canizales | 2016-08-03 |
| | | | | | | | | | | |||
* | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-08-04 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||
| | | | * | | | | | | Merge pull request #7613 from kpayson64/py_protobuf_upgrade | kpayson64 | 2016-08-03 |
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Bump python protobuf dependency to 3.0.0 | ||
| | | | | * | | | | | | Bump python protobuf dependency to 3.0.0 | Ken Payson | 2016-08-03 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | Nicolas "Pixel" Noble | 2016-08-03 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt Makefile build.yaml package.json src/core/lib/surface/version.c src/csharp/Grpc.Auth/project.json src/csharp/Grpc.Core/VersionInfo.cs src/csharp/Grpc.Core/project.json src/csharp/Grpc.HealthCheck/project.json src/csharp/build_packages.bat src/node/health_check/package.json src/node/tools/package.json src/python/grpcio/grpc_version.py src/python/grpcio_health_checking/grpc_version.py src/python/grpcio_tests/grpc_version.py src/ruby/lib/grpc/version.rb src/ruby/tools/version.rb tools/distrib/python/grpcio_tools/grpc_version.py tools/doxygen/Doxyfile.c++ tools/doxygen/Doxyfile.c++.internal tools/doxygen/Doxyfile.core tools/doxygen/Doxyfile.core.internal | ||
| | | | * | | | | | | | Update generated files with new protobuf version | Jorge Canizales | 2016-08-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make the script fetch protoc from the usual place. | ||
| | | | | | | * | | | | using temporary nuget location on windows | Alexander Polcyn | 2016-08-03 |
| | | | | | | | | | | | |||
| | | | | | | * | | | | ran script to update actual docker files | Alexander Polcyn | 2016-08-02 |
| | | |_|_|_|/ / / / | | |/| | | | | | | | |||
| * | | | | | | | | | Merge pull request #7554 from muxi/fix-cronet-interop-test | Muxi Yan | 2016-08-02 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix Objective-C test pods for Cronet tests |