aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Merge branch 'master' into move_timeout_encodingGravatar Robbie Shade2016-07-14
|\
| * Merge pull request #7364 from stanley-cheung/php-prepare-for-gaGravatar Stanley Cheung2016-07-13
| |\
| * \ Merge pull request #7265 from thunderboltsid/issue-7094-retryGravatar Nicolas Noble2016-07-13
| |\ \
| * \ \ Merge pull request #7112 from thunderboltsid/issue-7110Gravatar Nicolas Noble2016-07-13
| |\ \ \
| * \ \ \ Merge pull request #7357 from grpc/v1.0.xGravatar Jorge Canizales2016-07-13
| |\ \ \ \
| | | | | * add back version to composer.json fileGravatar Stanley Cheung2016-07-13
* | | | | | Move timeout_encoding from core/ext/transport/chttp2 to core/lib/transportGravatar Robbie Shade2016-07-13
|/ / / / /
| * | | | Merge pull request #7359 from jcanizales/p0-protoc-podspecGravatar makdharma2016-07-13
| |\ \ \ \
* | \ \ \ \ Merge pull request #7353 from kpayson64/fix_cygrpc_testGravatar kpayson642016-07-13
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge pull request #7044 from yang-g/sliceGravatar kpayson642016-07-13
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge pull request #6539 from soltanmm/clngfrmt-aoaGravatar kpayson642016-07-13
|\ \ \ \ \ \ \ \
| | | | | | | | * php: prepare for GA releaseGravatar Stanley Cheung2016-07-13
| |_|_|_|_|_|_|/ |/| | | | | | |
| | | | * | | | Merge pull request #7355 from soltanmm/count-bleckGravatar kpayson642016-07-13
| | | | |\ \ \ \
| | | | | | * | | Set Travis clone depth to 1, to alleviate workloadGravatar Jorge Canizales2016-07-13
| | | | | | * | | Fix Travis not finding !ProtoCompiler-gRPC.podspecGravatar Jorge Canizales2016-07-13
* | | | | | | | | Merge pull request #7248 from yang-g/server_testGravatar kpayson642016-07-12
|\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ Merge pull request #7356 from nicolasnoble/cherry-pick-fixGravatar Nicolas Noble2016-07-12
| | | | | |\ \ \ \ \
| | | | | | * | | | | Use test roots.pem in testGravatar yang-g2016-07-13
| | | | | |/ / / / /
| | | | | * | | | | Merge pull request #7350 from nicolasnoble/upmerge-0_15-1_0Gravatar Jorge Canizales2016-07-12
| | | | | |\ \ \ \ \
| | | | * | | | | | | Change sequence of client/server eventsGravatar Ken Payson2016-07-12
* | | | | | | | | | | Merge pull request #7257 from yang-g/sequential_conGravatar kpayson642016-07-12
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7317 from soltanmm/tadpolesGravatar kpayson642016-07-12
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7290 from soltanmm/auto-cyGravatar kpayson642016-07-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
| | | | | | | * | | | | | Merge pull request #7338 from kpayson64/remove_py_cruftGravatar kpayson642016-07-12
| | | | | | | |\ \ \ \ \ \
| | | | | | | | | | * | | | Add special methods to generated Python docsGravatar Masood Malekghassemi2016-07-12
| | | | | | | | |_|/ / / / | | | | | | | |/| | | | |
| | | | | | | | | * | | | Merge branch 'release-0_15' into v1.0.xGravatar Nicolas "Pixel" Noble2016-07-13
| | | | | | | | |/| | | | | | | | | | | |/| | | | |
| | | | | | | | | * | | | Merge pull request #7341 from nicolasnoble/podspec-no-template-0_15Gravatar Jorge Canizales2016-07-12
| | | | | | | | | |\ \ \ \
| | | | | | | | * | | | | | Remove early adopter codeGravatar Ken Payson2016-07-12
| | * | | | | | | | | | | | Patch `spawn` for Python 'unix' compilers insteadGravatar Masood Malekghassemi2016-07-12
| | | | | | | | | | * | | | Bringing 0.15 to protobuf beta 3.3 to satisfy both nodejs and objc.Gravatar Nicolas "Pixel" Noble2016-07-12
| | | | | * | | | | | | | | Clang-format all the thingsGravatar Masood Malekghassemi2016-07-12
| | | | | * | | | | | | | | Add src/compiler to clang formatGravatar Masood Malekghassemi2016-07-12
| |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| | | | | | * | | | | | | Merge pull request #7342 from kpayson64/python_metadata_defGravatar kpayson642016-07-12
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / / | | | | | | |/| | | | | |
| | | | | | | | | | * | | Fix TravisGravatar Jorge Canizales2016-07-12
* | | | | | | | | | | | | Merge pull request #7330 from dgquintas/fix_tsanGravatar kpayson642016-07-12
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #6595 from thinkerou/timeGravatar kpayson642016-07-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * | | | | | Added Glossary to docs with metadata definitionGravatar Ken Payson2016-07-12
| | | | | | | | |/ / / / / /
| | | | | | | | | | * / / / gRPC.podspec shouldn't be a template anymore.Gravatar Nicolas "Pixel" Noble2016-07-12
| | | | | | | | | |/ / / /
| | | | | | | * | | | | | Merge remote-tracking branch 'upstream/master' into sliceGravatar yang-g2016-07-12
| | | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
| | | | | | * | | | | | | Merge remote-tracking branch 'upstream/master' into server_testGravatar yang-g2016-07-12
| | | | | | |\ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
| | | | | * | | | | | | | Merge remote-tracking branch 'upstream/master' into sequential_conGravatar yang-g2016-07-12
| | | | | |\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #7336 from nicolasnoble/master-is-1.1Gravatar Nicolas Noble2016-07-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Master is now 1.1.0-dev.Gravatar Nicolas "Pixel" Noble2016-07-12
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #7335 from nicolasnoble/master-is-1.0.0-pre1Gravatar Nicolas Noble2016-07-12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Flagging master as 1.0.0-pre1.Gravatar Nicolas "Pixel" Noble2016-07-12
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #7322 from kpayson64/py_status_code_messageGravatar kpayson642016-07-11
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7315 from kpayson64/fix_exit_testGravatar kpayson642016-07-11
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7323 from kpayson64/fix_py_qpsGravatar kpayson642016-07-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7329 from nicolasnoble/upmerge-masterGravatar Nicolas Noble2016-07-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | Fix tsan raceGravatar David Garcia Quintas2016-07-11
| |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |