Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into move_timeout_encoding | 2016-07-14 | |
|\ | |||
| * | Merge pull request #7364 from stanley-cheung/php-prepare-for-ga | 2016-07-13 | |
| |\ | |||
| * \ | Merge pull request #7265 from thunderboltsid/issue-7094-retry | 2016-07-13 | |
| |\ \ | |||
| * \ \ | Merge pull request #7112 from thunderboltsid/issue-7110 | 2016-07-13 | |
| |\ \ \ | |||
| * \ \ \ | Merge pull request #7357 from grpc/v1.0.x | 2016-07-13 | |
| |\ \ \ \ | |||
| | | | | * | add back version to composer.json file | 2016-07-13 | |
* | | | | | | Move timeout_encoding from core/ext/transport/chttp2 to core/lib/transport | 2016-07-13 | |
|/ / / / / | |||
| * | | | | Merge pull request #7359 from jcanizales/p0-protoc-podspec | 2016-07-13 | |
| |\ \ \ \ | |||
* | \ \ \ \ | Merge pull request #7353 from kpayson64/fix_cygrpc_test | 2016-07-13 | |
|\ \ \ \ \ \ | |||
* \ \ \ \ \ \ | Merge pull request #7044 from yang-g/slice | 2016-07-13 | |
|\ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ | Merge pull request #6539 from soltanmm/clngfrmt-aoa | 2016-07-13 | |
|\ \ \ \ \ \ \ \ | |||
| | | | | | | | * | php: prepare for GA release | 2016-07-13 | |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||
| | | | * | | | | Merge pull request #7355 from soltanmm/count-bleck | 2016-07-13 | |
| | | | |\ \ \ \ | |||
| | | | | | * | | | Set Travis clone depth to 1, to alleviate workload | 2016-07-13 | |
| | | | | | * | | | Fix Travis not finding !ProtoCompiler-gRPC.podspec | 2016-07-13 | |
* | | | | | | | | | Merge pull request #7248 from yang-g/server_test | 2016-07-12 | |
|\ \ \ \ \ \ \ \ \ | |||
| | | | | * \ \ \ \ | Merge pull request #7356 from nicolasnoble/cherry-pick-fix | 2016-07-12 | |
| | | | | |\ \ \ \ \ | |||
| | | | | | * | | | | | Use test roots.pem in test | 2016-07-13 | |
| | | | | |/ / / / / | |||
| | | | | * | | | | | Merge pull request #7350 from nicolasnoble/upmerge-0_15-1_0 | 2016-07-12 | |
| | | | | |\ \ \ \ \ | |||
| | | | * | | | | | | | Change sequence of client/server events | 2016-07-12 | |
* | | | | | | | | | | | Merge pull request #7257 from yang-g/sequential_con | 2016-07-12 | |
|\ \ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #7317 from soltanmm/tadpoles | 2016-07-12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #7290 from soltanmm/auto-cy | 2016-07-12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |||
| | | | | | | * | | | | | | Merge pull request #7338 from kpayson64/remove_py_cruft | 2016-07-12 | |
| | | | | | | |\ \ \ \ \ \ | |||
| | | | | | | | | | * | | | | Add special methods to generated Python docs | 2016-07-12 | |
| | | | | | | | |_|/ / / / | | | | | | | |/| | | | | | |||
| | | | | | | | | * | | | | Merge branch 'release-0_15' into v1.0.x | 2016-07-13 | |
| | | | | | | | |/| | | | | | | | | | | |/| | | | | | |||
| | | | | | | | | * | | | | Merge pull request #7341 from nicolasnoble/podspec-no-template-0_15 | 2016-07-12 | |
| | | | | | | | | |\ \ \ \ | |||
| | | | | | | | * | | | | | | Remove early adopter code | 2016-07-12 | |
| | * | | | | | | | | | | | | Patch `spawn` for Python 'unix' compilers instead | 2016-07-12 | |
| | | | | | | | | | * | | | | Bringing 0.15 to protobuf beta 3.3 to satisfy both nodejs and objc. | 2016-07-12 | |
| | | | | * | | | | | | | | | Clang-format all the things | 2016-07-12 | |
| | | | | * | | | | | | | | | Add src/compiler to clang format | 2016-07-12 | |
| |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |||
| | | | | | * | | | | | | | Merge pull request #7342 from kpayson64/python_metadata_def | 2016-07-12 | |
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / / | | | | | | |/| | | | | | | |||
| | | | | | | | | | * | | | Fix Travis | 2016-07-12 | |
* | | | | | | | | | | | | | Merge pull request #7330 from dgquintas/fix_tsan | 2016-07-12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #6595 from thinkerou/time | 2016-07-12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | * | | | | | | Added Glossary to docs with metadata definition | 2016-07-12 | |
| | | | | | | | |/ / / / / / | |||
| | | | | | | | | | * / / / | gRPC.podspec shouldn't be a template anymore. | 2016-07-12 | |
| | | | | | | | | |/ / / / | |||
| | | | | | | * | | | | | | Merge remote-tracking branch 'upstream/master' into slice | 2016-07-12 | |
| | | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |||
| | | | | | * | | | | | | | Merge remote-tracking branch 'upstream/master' into server_test | 2016-07-12 | |
| | | | | | |\ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |||
| | | | | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into sequential_con | 2016-07-12 | |
| | | | | |\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge pull request #7336 from nicolasnoble/master-is-1.1 | 2016-07-12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | Master is now 1.1.0-dev. | 2016-07-12 | |
|/ / / / / / / / / / / / | |||
* | | | | | | | | | | | | Merge pull request #7335 from nicolasnoble/master-is-1.0.0-pre1 | 2016-07-12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | Flagging master as 1.0.0-pre1. | 2016-07-12 | |
|/ / / / / / / / / / / / | |||
* | | | | | | | | | | | | Merge pull request #7322 from kpayson64/py_status_code_message | 2016-07-11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #7315 from kpayson64/fix_exit_test | 2016-07-11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #7323 from kpayson64/fix_py_qps | 2016-07-11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #7329 from nicolasnoble/upmerge-master | 2016-07-11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | * | | | | | | | | | | Fix tsan race | 2016-07-11 | |
| |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | |