aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge pull request #5046 from murgatroid99/node_automatic_packagesGravatar Jan Tattermusch2016-02-03
|\ | | | | Add package build script for Node.js
| * Fixed copy/paste errors in package_target.pyGravatar murgatroid992016-02-03
| |
| * Add package build script for Node.jsGravatar murgatroid992016-02-03
| |
* | Merge pull request #4958 from sreecha/server_try_cancel_apiGravatar Yang Gao2016-02-03
|\ \ | | | | | | Implement a TryCancel() API on ServerContext to cancel the API from the server side
* \ \ Merge pull request #5044 from jtattermusch/csharp_more_distribtestsGravatar Michael Lumish2016-02-03
|\ \ \ | | | | | | | | Add more C# distribtest platforms
* \ \ \ Merge pull request #5045 from jtattermusch/run_distribtestGravatar Michael Lumish2016-02-03
|\ \ \ \ | | | | | | | | | | Enable running distribtests on Jenkins
| * | | | enable running distribtest on jenkinsGravatar Jan Tattermusch2016-02-03
| | |_|/ | |/| |
* | | | Merge pull request #5039 from vjpai/limit_coresGravatar David G. Quintas2016-02-03
|\ \ \ \ | |/ / / |/| | | Fix core limit dummy code for non-Linux cases
* | | | Merge pull request #4999 from adelez/fix_interop_reportGravatar adelez2016-02-03
|\ \ \ \ | | | | | | | | | | Handle the case where result.http2results is none.
| | | * | add more C# distribtest platformsGravatar Jan Tattermusch2016-02-03
| | | | |
* | | | | Merge pull request #5040 from murgatroid99/node_artifactsGravatar Jan Tattermusch2016-02-03
|\ \ \ \ \ | | | | | | | | | | | | Add working Node artifact builder for all platforms
* \ \ \ \ \ Merge pull request #5032 from yang-g/two_implsGravatar Nicolas Noble2016-02-03
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Fix clean up logic when failing to add a secure port.
* | | | | | Merge pull request #5036 from ctiller/fixes2Gravatar Jan Tattermusch2016-02-03
|\ \ \ \ \ \ | | | | | | | | | | | | | | Binary compatibility fixes
| | | * \ \ \ Merged from masterGravatar murgatroid992016-02-03
| | | |\ \ \ \
| | | | | | | * Run tools/distrib/clang_format_code.shGravatar Sree Kuchibhotla2016-02-03
| | | | | | | |
| | | * | | | | Add working Node artifact builder for all platformsGravatar murgatroid992016-02-03
| | | | | | | |
* | | | | | | | Merge pull request #5033 from nicolasnoble/gemfile.lock-ignoreGravatar Michael Lumish2016-02-03
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Ignoring Gemfile.lock file.
| | | | | | * | Took out dependence on vectorGravatar vjpai2016-02-03
| | | | | | | |
| | | | | | * | Merge branch 'master' into limit_coresGravatar vjpai2016-02-03
| | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | |
| | | | | | * | Forgot to put this in the Mac versionGravatar vjpai2016-02-03
| | | | | | | |
| | | | | | | * Merge branch 'master' into server_try_cancel_apiGravatar Sree Kuchibhotla2016-02-03
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | |
| | * | | | | | Better dynamic linkingGravatar Craig Tiller2016-02-03
| | | | | | | |
| | * | | | | | Prevent infinite loopGravatar Craig Tiller2016-02-03
| | | |_|_|/ / | | |/| | | |
| * / | | | | Ignoring Gemfile.lock file.Gravatar Nicolas "Pixel" Noble2016-02-03
|/ / / / / /
| | * | | | remove debug commmentsGravatar yang-g2016-02-02
| | | | | |
| | * | | | add a testGravatar yang-g2016-02-02
| | | | | |
* | | | | | Merge pull request #5001 from a11r/doc4Gravatar Jorge Canizales2016-02-02
|\ \ \ \ \ \ | | | | | | | | | | | | | | Create statuscodes.md
| | | * | | | clean up the clean up codeGravatar yang-g2016-02-02
| | | | | | |
* | | | | | | Merge pull request #5002 from jtattermusch/more_artifactsGravatar Craig Tiller2016-02-02
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Build ruby linux artifacts on Jenkins
* \ \ \ \ \ \ \ Merge pull request #5012 from ctiller/python_targetsGravatar Jan Tattermusch2016-02-02
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Python and Ruby targets for distribution testing
| | * | | | | | | increase timeoutGravatar Jan Tattermusch2016-02-02
| | | | | | | | |
| | * | | | | | | build ruby artifactGravatar Jan Tattermusch2016-02-02
| | | | | | | | |
* | | | | | | | | Merge pull request #5011 from jtattermusch/csharp_pem_resourceGravatar Jan Tattermusch2016-02-02
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Make roots.pem an embedded resource for C#.
* \ \ \ \ \ \ \ \ \ Merge pull request #5019 from yang-g/two_implsGravatar Sree Kuchibhotla2016-02-02
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | / / / / | | |_|_|_|/ / / / | |/| | | | | | | Remove the old impl caused by 4921
* | | | | | | | | Merge pull request #5023 from jtattermusch/distribtest_progressGravatar Nicolas Noble2016-02-02
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | C# distribtest fixes
| * | | | | | | | | libc6-dev no longer required for C#Gravatar Jan Tattermusch2016-02-02
| | | | | | | | | |
| * | | | | | | | | Also install nuget for the centos testGravatar Jan Tattermusch2016-02-02
|/ / / / / / / / /
* | | | | | | | | Merge pull request #5021 from nicolasnoble/ruby-last-fixesGravatar Craig Tiller2016-02-02
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Removing memcpy's wrapper for windows-ruby.
| * | | | | | | | | Removing memcpy's wrapper for windows-ruby.Gravatar Nicolas "Pixel" Noble2016-02-03
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4936 from nicolasnoble/make-ruby-installableGravatar Craig Tiller2016-02-02
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | Make ruby installable
| | | | * | | | | No arch for Ruby yetGravatar Craig Tiller2016-02-02
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of github.com:grpc/grpc into make-ruby-installableGravatar Nicolas "Pixel" Noble2016-02-03
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: BUILD Makefile binding.gyp build.yaml gRPC.podspec grpc.gemspec package.json src/python/grpcio/grpc_core_dependencies.py templates/Makefile.template tools/doxygen/Doxyfile.core.internal tools/run_tests/sources_and_headers.json vsprojects/vcxproj/gpr/gpr.vcxproj vsprojects/vcxproj/gpr/gpr.vcxproj.filters
| | * | | | | | | remove duplicate functionsGravatar yang-g2016-02-02
| | | | | | | | |
| | | | * | | | | Ruby linux testing supportGravatar Craig Tiller2016-02-02
| | | | | | | | |
| | | | | * | | | Addressed comments by jcanizalesGravatar Abhishek Kumar2016-02-02
| | | | | | | | |
| | * | | | | | | remove the old impl caused by 4921Gravatar yang-g2016-02-02
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #5015 from ctiller/memcpy_reduxGravatar Jan Tattermusch2016-02-02
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix c# artifact builder
* \ \ \ \ \ \ \ \ Merge pull request #5016 from nathanielmanistaatgoogle/env-python2.7Gravatar Craig Tiller2016-02-02
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | /usr/bin/env python -> /usr/bin/env python2.7
| | * | | | | | | | Dont need this for 32bitGravatar Craig Tiller2016-02-02
| | | | | | | | | |
| * | | | | | | | | /usr/bin/env python -> /usr/bin/env python2.7Gravatar Nathaniel Manista2016-02-02
|/ / / / / / / / /