aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
...
* | | | | | | | | | | | Merge pull request #2092 from jcanizales/point-to-official-proto-podspecGravatar Michael Lumish2015-06-17
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | Link to official protobuf podspec in the README
| | | | | | | | | * | | Merge pull request #21 from jtattermusch/we-dont-need-no-backup-undo-hotfixGravatar Craig Tiller2015-06-17
| | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | undo hotfix from #1731
| | | | | | | | * | | | Merge branch 'fix_intermediary_low_test_for_1577' of ↵Gravatar Craig Tiller2015-06-17
| | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:nathanielmanistaatgoogle/grpc into merge-merge-merge
| | | | | | | | * | | | | podspecGravatar Craig Tiller2015-06-17
| | | | | | | | | | | | |
| * | | | | | | | | | | | Link to official protobuf podspec in the READMEGravatar Jorge Canizales2015-06-17
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | It was still linking to my pull request's podspec.
| | | | | | | | | * | | undo hotfix from #1731Gravatar Jan Tattermusch2015-06-17
| | | | | | | | | | | |
| | | | | | | * | | | | Merge branch 'you-complete-me' into we-dont-need-no-backupGravatar Craig Tiller2015-06-17
| | | | | | | |\ \ \ \ \ | | | | | | | | |_|/ / / | | | | | | | |/| | | |
| | | | | | | | * | | | Merge github.com:grpc/grpc into you-complete-meGravatar Craig Tiller2015-06-17
| | | |_|_|_|_|/| | | | | | |/| | | | |/ / / / | |_|_|_|_|_|/| | | | |/| | | | | | | | | |
| | | | | | | * | | | Merge branch 'you-complete-me' into we-dont-need-no-backupGravatar Craig Tiller2015-06-17
| | | | | | | |\ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge pull request #20 from jtattermusch/you-complete-me-csharp-hotfixGravatar Craig Tiller2015-06-17
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | temporary hotfix before backup poller removal is done
| | | * | | | | | | | | temporary hotfix before #1577 is inGravatar Jan Tattermusch2015-06-17
| | |/ / / / / / / / /
| | | | | | | | * | | Adapt _intermediary_low_test to no backup pollerGravatar Nathaniel Manista2015-06-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull request #1577 removes the backup poller internal to completion queues so this test needs to use extra threads to drive the work done inside the completion queues by continuously calling each completion queue's get method.
| | | | | | | | | * | Split cq creation from request initiation so that cq creationGravatar Vijay Pai2015-06-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can be removed from C++ lock.
* | | | | | | | | | | Merge pull request #2064 from nicolasnoble/objc-generate-podspec-from-templateGravatar Michael Lumish2015-06-17
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Transforming gRPC.podspec to use build.json instead of globbing.
| | | | | | | | * | | | clang-format affected filesGravatar Craig Tiller2015-06-17
| | | | | | | | | | | |
| | | | | | | | | | * | Merge remote-tracking branch 'ctiller-repo/we-dont-need-no-backup' into poller2Gravatar Vijay Pai2015-06-17
| | | | | | | | | | |\ \ | | | | | | | | | |_|/ / | | | | | | | | |/| | |
| | | | | | | | * | | | Fix flag settings on this testGravatar Craig Tiller2015-06-17
| | | | | | | | | | | |
| | | | | | | | * | | | Merge branch 'we-dont-need-no-backup' of github.com:ctiller/grpc into ↵Gravatar Craig Tiller2015-06-17
| | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we-dont-need-no-backup
| | | | | | | | * \ \ \ \ Merge branch 'you-complete-me' into we-dont-need-no-backupGravatar Craig Tiller2015-06-17
| | | | | | | | |\ \ \ \ \ | | | | |_|_|_|_|/ / / / / | | | |/| | | | | | / / / | | | | | | | | | |/ / / | | | | | | | | |/| | |
| | | * | | | | | | | | Fix Python compilationGravatar Craig Tiller2015-06-17
| | | | | | | | | | | |
| | | * | | | | | | | | Merge github.com:grpc/grpc into you-complete-meGravatar Craig Tiller2015-06-17
| | | |\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| | | * | | | | | | | | Migrate new test to new apiGravatar Craig Tiller2015-06-17
| | | | | | | | | | | |
| | | * | | | | | | | | Merge pull request #16 from tbetbetbe/you-complete-meGravatar Craig Tiller2015-06-17
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Initial progress on ruby shutdown api migration
| | | | * | | | | | | | | Ruby shutdown api migrationGravatar Tim Emiola2015-06-17
| | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + all tests pass, - but there are a couple of workarounds - tests are flaky
* | | | | | | | | | | | Merge pull request #2085 from nicolasnoble/jenkins-sanityGravatar Jan Tattermusch2015-06-16
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Various Jenkins-related tweaks.
| * | | | | | | | | | | | Various Jenkins-related tweaks.Gravatar Nicolas "Pixel" Noble2015-06-17
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -) created a .profile at the root of the docker image - seems the new nvm script requires that. -) installing simplejson and mako python packages, for the sanity check. -) calling prepare_travis.sh in order to try and download precompiled packages for openssl and protobuf. -) using the new "config" axis. -) improved the output of prepare_travis.sh.
| | | | * | | | | | | | One more thing...Gravatar Yang Gao2015-06-16
| | | | | | | | | | | |
| | | | * | | | | | | | Merge remote-tracking branch 'upstream/master' into grpc_cli_headersGravatar Yang Gao2015-06-16
| | | | |\ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| | | | | * | | | | | | Fixed wrong switch label nameGravatar David Garcia Quintas2015-06-16
| | | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #4 from murgatroid99/objc-generate-podspec-from-templateGravatar Nicolas Noble2015-06-16
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed file renaming in podspec template
| | | | * \ \ \ \ \ \ \ \ Merge github.com:grpc/grpc into you-complete-meGravatar Craig Tiller2015-06-16
| | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| | | | | | | | | | * | | Compile fixGravatar Craig Tiller2015-06-16
| | | | | | | | | | | | |
| | | | | | | | | | * | | Merge github.com:grpc/grpc into we-dont-need-no-backupGravatar Craig Tiller2015-06-16
| | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #2081 from soltanmm/c89-oopsGravatar Nathaniel Manista2015-06-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make warnings errors when building Python tests.
| | | | | | | | | | | * \ \ Merge branch 'we-dont-need-no-backup' of github.com:ctiller/grpc into ↵Gravatar Craig Tiller2015-06-16
| | | | | | | | | | | |\ \ \ | | | | | | | | | | | |/ / / | | | | | | | | | | |/| | | | | | | | | | | | | | | | | we-dont-need-no-backup
| | | | | | | | | | | * | | Merge branch 'you-complete-me' into we-dont-need-no-backupGravatar Craig Tiller2015-06-16
| | | | | | | | | | | |\ \ \ | | | | | | |_|_|_|_|_|/ / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/python/src/grpc/_adapter/_c/utility.c
| | | * | / | | | | | | | | Fixed file renaming in podspec templateGravatar murgatroid992015-06-16
| | |/ / / / / / / / / / /
| | | | | * | | | | | | | merge with upstreamGravatar Yang Gao2015-06-16
| | | | | |\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Make warnings errors when building Python testsGravatar Masood Malekghassemi2015-06-16
| | | | | | | | | | | | |
| | | | | | | * | | | | | fix indentationGravatar Jan Tattermusch2015-06-16
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #2079 from yang-g/statusChangeGravatar Nicolas Noble2015-06-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | Update the Status API
* | | | | | | | | | | | | Merge pull request #2054 from dgquintas/flags-abiGravatar Craig Tiller2015-06-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added flags support to grpc_op.
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #2063 from stanley-cheung/php_timeout_interop_testGravatar Tim Emiola2015-06-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | Add PHP timeout interop test
| | | | | | | | * | | | | | Exposed compression level in channel arguments (C and C++)Gravatar David Garcia Quintas2015-06-16
| | | | | | | | | | | | | |
| | | | | | | | | | | | | * Merge branch 'compression-levels' into compression-metadataGravatar David Garcia Quintas2015-06-16
| | | | | | | | | | | | | |\ | | | | | | | | | |_|_|_|_|/ | | | | | | | | |/| | | | |
| | | * | | | | / | | | | | Update the Status APIGravatar Yang Gao2015-06-16
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| | | | | | | | | | | * | Merge remote-tracking branch 'ctiller-repo/we-dont-need-no-backup' into poller2Gravatar Vijay Pai2015-06-16
| | | | | | | | | | | |\ \ | | | | | | | | | | |_|/ / | | | | | | | | | |/| | |
* | | | | | | | | | | | | Merge pull request #2074 from jcanizales/fix-metadata-usage-in-exampleGravatar Michael Lumish2015-06-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix NPE for trying to add metadata to error when it was nil
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #2077 from grpc/jtattermusch-patch-4Gravatar Nathaniel Manista2015-06-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make run_jenkins.sh actually fail on failure.
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #2066 from stanley-cheung/add_php_to_jenkinsGravatar Jan Tattermusch2015-06-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add PHP to jenkins