Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into cleaner-build | Craig Tiller | 2015-08-31 |
|\ | |||
| * | Merge pull request #3107 from a-veitch/view_api | Hongyu Chen | 2015-08-31 |
| |\ | |||
* | | | Fix sanity | Craig Tiller | 2015-08-31 |
| | * | change aggregation_ops to internal type | Alistair Veitch | 2015-08-31 |
* | | | Add python-yaml | Craig Tiller | 2015-08-31 |
* | | | Hand-written changes | Craig Tiller | 2015-08-31 |
|/ / | |||
* | | Merge pull request #2933 from jboeuf/cpp_auth_md_processor | Yang Gao | 2015-08-31 |
|\ \ | |||
* \ \ | Merge pull request #3134 from nathanielmanistaatgoogle/beta | Masood Malekghassemi | 2015-08-31 |
|\ \ \ | |||
| | | * | merge | Alistair Veitch | 2015-08-31 |
| | | |\ | |||
* | | | | | php: fix gce testing dockerfile | Stanley Cheung | 2015-08-31 |
| |_|_|/ |/| | | | |||
| * | | | The rest of the Python Beta API | Nathaniel Manista | 2015-08-31 |
| | * | | Fixing headers and paths after merge with upstream. | Julien Boeuf | 2015-08-30 |
| | * | | Merge branch 'master' of github.com:grpc/grpc into cpp_auth_md_processor | Julien Boeuf | 2015-08-30 |
| | |\ \ | |_|/ / |/| | | | |||
* | | | | Merge branch 'master' into tracing_api | Alistair Veitch | 2015-08-28 |
|\| | | | |||
| | * | | Merge branch 'master' of github.com:grpc/grpc into cpp_auth_md_processor | Julien Boeuf | 2015-08-28 |
| | |\ \ | | |/ / | |/| | | |||
| | | * | merge to head | Alistair Veitch | 2015-08-28 |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Merge github.com:grpc/grpc into reject-the-stuffs | Craig Tiller | 2015-08-27 |
| |\ \ \ | |||
| | | * \ | Merge branch 'master' of github.com:grpc/grpc into cpp_auth_md_processor | Julien Boeuf | 2015-08-27 |
| | | |\ \ | | | |/ / | | |/| | | |||
| | * | | | Fix build | yang-g | 2015-08-27 |
| | | * | | Merge branch 'master' of github.com:grpc/grpc into cpp_auth_md_processor | Julien Boeuf | 2015-08-27 |
| | | |\ \ | | | |/ / | | |/| | | |||
| * / | | | Outlaw comma in non-binary metadata values | Craig Tiller | 2015-08-27 |
| |/ / / | |||
| | | * | view and aggregation API | Alistair Veitch | 2015-08-27 |
| * | | | Merge pull request #2863 from jtattermusch/csharp_upgrade_to_proto3 | Michael Lumish | 2015-08-27 |
| |\ \ \ | |||
| | * | | | upgrade third_party/protobufs to 3.0.0-beta-1 | Jan Tattermusch | 2015-08-27 |
| * | | | | Merge pull request #3052 from nathanielmanistaatgoogle/crust | Masood Malekghassemi | 2015-08-27 |
| |\ \ \ \ | |||
| * | | | | | Increase msan timeout also | Craig Tiller | 2015-08-26 |
| * | | | | | Merge pull request #3077 from yang-g/string_ref_auth | Craig Tiller | 2015-08-26 |
| |\ \ \ \ \ | |||
| * | | | | | | php: fix build failure on mac | Stanley Cheung | 2015-08-26 |
| * | | | | | | Up asan/tsan timeouts - they need it | Craig Tiller | 2015-08-26 |
| | |_|/ / / | |/| | | | | |||
| | | | * | | Merge branch 'master' of github.com:grpc/grpc into cpp_auth_md_processor | Julien Boeuf | 2015-08-26 |
| | | | |\ \ | |||
| | * | | \ \ | Merge remote-tracking branch 'upstream/master' into string_ref_auth | yang-g | 2015-08-26 |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| * | | | | | | Merge pull request #3065 from yang-g/string_ref | Craig Tiller | 2015-08-26 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge pull request #3048 from maxwell-demon/timespec | Craig Tiller | 2015-08-26 |
| |\ \ \ \ \ \ \ | |||
| * | | | | | | | | Fix typo | Craig Tiller | 2015-08-26 |
| * | | | | | | | | Make run_tests.py robust against port_server not starting | Craig Tiller | 2015-08-26 |
| * | | | | | | | | Merge pull request #3073 from jtattermusch/appdomain_unloaded_exception | Michael Lumish | 2015-08-25 |
| |\ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | prevent occasional AppDomainUnloadedException from nunit | Jan Tattermusch | 2015-08-25 |
| * | | | | | | | | | Merge pull request #3068 from ctiller/make-might-take-a-very-long-time | Jan Tattermusch | 2015-08-25 |
| |\ \ \ \ \ \ \ \ \ | |||
| | | | | | * | | | | | auth context api change for string_ref | yang-g | 2015-08-25 |
| | | | | |/ / / / / | |||
| | | | * | | | | | | More merge conflict fix | Hongyu Chen | 2015-08-25 |
| | | | * | | | | | | Merge remote-tracking branch 'upstream/master' into timespec | Hongyu Chen | 2015-08-25 |
| | | | |\ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||
| * | | | | | | | | | Merge pull request #3021 from ctiller/reject-the-stuffs | Yang Gao | 2015-08-25 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||
* | | | | | | | | | | merge to head | Alistair Veitch | 2015-08-25 |
|\| | | | | | | | | | |||
| | | | | | | * | | | The RPC Framework crust package | Nathaniel Manista | 2015-08-25 |
| | | | | | | | |/ | | | | | | | |/| | |||
| | | | | * | | | | Merge remote-tracking branch 'upstream/master' into timespec | Hongyu Chen | 2015-08-25 |
| | | | | |\ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||
| * | | | | | | | | Merge pull request #3059 from soltanmm/timeout | Nathaniel Manista | 2015-08-25 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||
| | | | * | | | | | Windows builds need longer | Craig Tiller | 2015-08-25 |
| | |_|/ / / / / | |/| | | | | | | |||
| | | | | * | | | Merge remote-tracking branch 'upstream/master' into string_ref | yang-g | 2015-08-25 |
| | | | | |\ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||
| * | | | | | | | add missing headers from 2495 | yang-g | 2015-08-25 |
| | * | | | | | | Add global per-test timeout to Python test harness | Masood Malekghassemi | 2015-08-25 |
| | | |_|_|/ / | | |/| | | | |