aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* removed codegen/time.hGravatar David Garcia Quintas2016-07-27
* removed codegen/byte_buffer.hGravatar David Garcia Quintas2016-07-27
* removed codegen/alloc.hGravatar David Garcia Quintas2016-07-27
* Merge pull request #7535 from muxi/fix-no-as-neededGravatar Nicolas Noble2016-07-27
|\
* \ Merge pull request #7546 from tberghammer/proto-liteGravatar Nicolas Noble2016-07-27
|\ \
* \ \ Merge pull request #7459 from nicolasnoble/udp_test_bitrotGravatar Vijay Pai2016-07-27
|\ \ \
| | * | Add cmake option to compile using protobuf-liteGravatar Tamas Berghammer2016-07-27
| |/ / |/| |
* | | Merge pull request #7539 from stanley-cheung/php-minor-cleanup-gaGravatar Stanley Cheung2016-07-26
|\ \ \
| * | | update READMEGravatar Stanley Cheung2016-07-26
| * | | php: fix composer.jsonGravatar Stanley Cheung2016-07-26
|/ / /
* | | Merge pull request #7532 from thinkerou/wrap_php7_secondGravatar Stanley Cheung2016-07-26
|\ \ \
| | | * Identify system and remove --no-as-need if it is Mac OSGravatar Muxi Yan2016-07-26
| | | * Removed --no-as-needed options from Makefile of HelloWorld and RouteGuideGravatar Muxi Yan2016-07-26
| |_|/ |/| |
| * | fix indent use two spacesGravatar thinkerou2016-07-27
| * | add macro to php7_wrapper for reduce duplicate codeGravatar thinkerou2016-07-27
|/ /
* | Merge pull request #7525 from muxi/add-interop-cronet-testGravatar makdharma2016-07-26
|\ \
* \ \ Merge pull request #7517 from markdroth/handshake_apiGravatar kpayson642016-07-26
|\ \ \
* \ \ \ Merge pull request #7527 from jskeet/nullloggerGravatar kpayson642016-07-26
|\ \ \ \
* \ \ \ \ Merge pull request #7498 from thinkerou/wrap_php7Gravatar kpayson642016-07-26
|\ \ \ \ \
* \ \ \ \ \ Merge pull request #7477 from yang-g/monotonicGravatar kpayson642016-07-26
|\ \ \ \ \ \
| | | * | | | Change the default logger to the NullLogger.Gravatar Jon Skeet2016-07-26
| |_|/ / / / |/| | | | |
| | | | * | Add InteropTestsRemoteWithCronet to the testsGravatar Muxi Yan2016-07-25
* | | | | | Merge pull request #7511 from nicolasnoble/doc-typoGravatar kpayson642016-07-25
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge pull request #7512 from stanley-cheung/php-cleanup-dockerfileGravatar kpayson642016-07-25
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge pull request #7497 from soltanmm/be-nicerGravatar kpayson642016-07-25
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge pull request #7518 from nicolasnoble/plugins-should-compileGravatar Nicolas Noble2016-07-25
|\ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ Merge pull request #4 from stanley-cheung/wrap_php7Gravatar 田欧2016-07-26
| | | | | | |\ \ \ \
| | | | | | | * | | | update copyrightGravatar Stanley Cheung2016-07-25
| | | | | | |/ / / /
| | | | | | * | | | Merge pull request #3 from stanley-cheung/wrap_php7Gravatar 田欧2016-07-26
| | | | | | |\ \ \ \
* | | | | | | \ \ \ \ Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_masterGravatar Nicolas Noble2016-07-25
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7020 from rjshade/assert_not_expectGravatar kpayson642016-07-25
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7451 from y-zeng/seperate_generated_filesGravatar kpayson642016-07-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| | | | | | | | | | | * | clang-formatGravatar Mark D. Roth2016-07-25
| | | | | | * | | | | | | fix copyrightGravatar Stanley Cheung2016-07-25
| | | | | | | | | | * | | add file to build.yamlGravatar Stanley Cheung2016-07-25
| | | | | | | | | |/ / /
| | | | * | | | | / / / We should always try to compile the protoc plugins when building tests.Gravatar Nicolas "Pixel" Noble2016-07-25
| |_|_|/ / / / / / / / |/| | | | | | | | | |
| | | | | | | | | * | Fix API of handshake_manager_add().Gravatar Mark D. Roth2016-07-25
| | | | | | | | | * | Merge remote-tracking branch 'upstream/master' into handshake_api2Gravatar Mark D. Roth2016-07-25
| | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| | | * | | | | | | | Rerun generate_projects.shGravatar murgatroid992016-07-25
* | | | | | | | | | | Merge pull request #7395 from markdroth/handshake_apiGravatar kpayson642016-07-25
|\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | Fix merge againGravatar murgatroid992016-07-25
* | | | | | | | | | | | Merge pull request #7501 from dgquintas/phony_async_streamGravatar kpayson642016-07-25
|\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | php: add php7 to jenkins basic and interop testsGravatar Stanley Cheung2016-07-23
| | | | | | | * | | | | | php: remove protobuf-php clone hackGravatar Stanley Cheung2016-07-22
| | | | | | | * | | | | | remove outdated php dockerfile dependencyGravatar Stanley Cheung2016-07-22
| |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #7320 from yang-g/shut_down_acceptor_earlyGravatar Nicolas Noble2016-07-22
|\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * | | | | Fixing documentation typo.Gravatar Nicolas "Pixel" Noble2016-07-23
| |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #7510 from stanley-cheung/regenerate-template-filesGravatar Stanley Cheung2016-07-22
|\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * | | | | Be more intelligent about Cython in grpcioGravatar Masood Malekghassemi2016-07-22
| | | | | | | * | | | | | Fixed incorrect mergesGravatar murgatroid992016-07-22