aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Use grpc_error instead of bool in udp_server's on_readGravatar Robbie Shade2016-07-13
* Correct error handling for failed set_sockopt calls in udp_server.cGravatar Robbie Shade2016-07-13
* Merge pull request #7350 from nicolasnoble/upmerge-0_15-1_0Gravatar Jorge Canizales2016-07-12
|\
* \ Merge pull request #7338 from kpayson64/remove_py_cruftGravatar kpayson642016-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
| | | * Bringing 0.15 to protobuf beta 3.3 to satisfy both nodejs and objc.Gravatar Nicolas "Pixel" Noble2016-07-12
* | | | Merge pull request #7342 from kpayson64/python_metadata_defGravatar 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 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
|\ \ \ \ \
| | * | | | Updated python qps tests to use GA server APIGravatar Ken Payson2016-07-11
| * | | | | Addressing comments.Gravatar Nicolas "Pixel" Noble2016-07-12
| * | | | | Merge branch 'release-0_15' into upmerge-masterGravatar Nicolas "Pixel" Noble2016-07-12
|/| | | | | | | |_|_|/ | |/| | |
| * | | | Merge pull request #7321 from nicolasnoble/upmergeGravatar Nicolas Noble2016-07-11
| |\ \ \ \
* | \ \ \ \ Merge pull request #7291 from ctiller/better_statusGravatar Nicolas Noble2016-07-11
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge pull request #7292 from y-zeng/fix_mac_buildGravatar kpayson642016-07-11
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge pull request #7310 from kpayson64/hold_gil_during_cleanupGravatar kpayson642016-07-11
|\ \ \ \ \ \ \ \
| | | | | | | * | Updated exit_test for new grpc.Server APIGravatar Ken Payson2016-07-11
| | | | | | |/ /
| | | | | | | * Implemented python status_code_and_message interop testGravatar Ken Payson2016-07-11
| | | | | * | | Merge branch 'release-0_14' into release-0_15Gravatar Nicolas "Pixel" Noble2016-07-12
| | | | |/| | |
| | | * | | | | clang-formatGravatar Craig Tiller2016-07-11
| | * | | | | | Merge remote-tracking branch 'upstream/master' into fix_mac_buildGravatar Yuchen Zeng2016-07-11
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge pull request #7297 from dgquintas/compression_cookbookGravatar Nicolas Noble2016-07-11
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #7312 from kpayson64/fix_sanityGravatar kpayson642016-07-11
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Updated composer.json.templateGravatar Ken Payson2016-07-11
|/ / / / / / / /
* | | | | | | | Merge pull request #7235 from tberghammer/cmake-protobufGravatar Nicolas Noble2016-07-11
|\ \ \ \ \ \ \ \
| | | * | | | | | Hold onto the GIL in __dealloc__ functionsGravatar Ken Payson2016-07-11
| | | | |_|_|_|/ | | | |/| | | |
* | | | | | | | Merge pull request #7242 from yang-g/importGravatar kpayson642016-07-11
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge pull request #7286 from stanley-cheung/php-update-authGravatar kpayson642016-07-11
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge pull request #7289 from stanley-cheung/php-remove-debugGravatar kpayson642016-07-11
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge pull request #7288 from makdharma/protobuf_import_issue7219Gravatar makdharma2016-07-11
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7307 from kpayson64/port_server_timeoutGravatar kpayson642016-07-11
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Added timeout to port serverGravatar Ken Payson2016-07-09
|/ / / / / / / / / / /
| | | | | | * / / / / Compression CookbookGravatar David Garcia Quintas2016-07-08
| |_|_|_|_|/ / / / / |/| | | | | | | | |
| | | | * | | | | | another oneGravatar yang-g2016-07-08
| | | | * | | | | | Merge remote-tracking branch 'upstream/master' into importGravatar yang-g2016-07-08
| | | | |\ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #7274 from murgatroid99/ruby_api_review_changesGravatar kpayson642016-07-08
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge pull request #7160 from nathanielmanistaatgoogle/handlers-optionalGravatar kpayson642016-07-08
|\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | removed unneeded import. fixes travis buildGravatar Makarand Dharmapurikar2016-07-08
* | | | | | | | | | | | Merge pull request #7195 from soltanmm/winfixGravatar kpayson642016-07-08
|\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * | | Convert time to monotonic internallyGravatar Craig Tiller2016-07-08
| | | | * | | | | | | | | added a comment just to retrigger testsGravatar Makarand Dharmapurikar2016-07-08
* | | | | | | | | | | | | Merge pull request #7272 from nathanielmanistaatgoogle/rendezvous-exceptionGravatar kpayson642016-07-08
|\ \ \ \ \ \ \ \ \ \ \ \ \