aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
...
| | | | | | | | | | | | | | * | | | Update dockerfile of gRpc Android interop test to use the code inside ↵Gravatar Xudong Ma2015-07-08
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | grpc-java repository.
| | * | | | | | | | | | | | | | | Fixing variable names discrepancy in ruby's extension builder.Gravatar Nicolas "Pixel" Noble2015-07-08
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG != GRPC_CONFIG, meaning we're always building released, even in debug.
| * | | | | | | | | | | | | | | Merge pull request #2318 from murgatroid99/ruby_pkg_configGravatar Nicolas Noble2015-07-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use pkg-config if possible when building the ruby extension
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #2331 from vjpai/ttyGravatar Craig Tiller2015-07-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't send terminal escapes if we're outputing to a file
| | | | | | * | | | | | | | | | | | Fixed typo in variable nameGravatar murgatroid992015-07-08
| | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | Merge branch 'master' into makefile_pkg-config_libs_fixGravatar murgatroid992015-07-08
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | Added OpenSSL NPN pkg-config checkGravatar murgatroid992015-07-08
| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Fixed Rubocop errors in extconf.rbGravatar murgatroid992015-07-08
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge pull request #2316 from ctiller/tis-but-thy-nameGravatar Nicolas Noble2015-07-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix TSAN reported bug
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #2317 from jboeuf/fix_json_docGravatar Nicolas Noble2015-07-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing json doc.
| | | | | * | | | | | | | | | | | | | | Fixed ruby build when rebuilding C coreGravatar murgatroid992015-07-08
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge pull request #2302 from jcanizales/point-to-protobuf-headGravatar Michael Lumish2015-07-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Point tests to protobuf head
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ Merged changes from upstream/masterGravatar murgatroid992015-07-08
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge pull request #2310 from murgatroid99/node_pkg_configGravatar Nicolas Noble2015-07-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use pkg-config when building the Node extension, if possible
| | | | | | * | | | | | | | | | | | | | | | Merge non-tty path with Windows path since they do the same thingGravatar vjpai2015-07-08
| | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | * | | | | | | | | | | Don't use pkg-config to look for perftoolsGravatar murgatroid992015-07-08
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge pull request #2269 from murgatroid99/node_binding_gyp_fixesGravatar Nicolas Noble2015-07-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Node binding gyp fixes
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #2326 from ctiller/we-lost-our-sanityGravatar Nicolas Noble2015-07-08
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore sanity
| | | | | | | * | | | | | | | | | | | | | | Stop sending terminal escape sequences if we're redirecting output to a file.Gravatar vjpai2015-07-08
| |_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #2304 from ctiller/just-say-goodbye-when-we-are-doneGravatar Vijay Pai2015-07-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change transport contract to automatically disconnect after sending a goaway
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #2325 from jcanizales/be-ios6-compatibleGravatar Michael Lumish2015-07-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don’t use containsString as it’s iOS 8 only
| | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge github.com:grpc/grpc into screw-you-guys-im-taking-my-own-lockGravatar Craig Tiller2015-07-08
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | * | | | | | Remove extraneous explicitGravatar Craig Tiller2015-07-08
| | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | * | | | | | Update commentsGravatar Craig Tiller2015-07-08
| | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Restore sanityGravatar Craig Tiller2015-07-08
| |_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | * | | | | | Fix MakefileGravatar Craig Tiller2015-07-08
| | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | * | | | | | Merge github.com:grpc/grpc into hosts-need-names-tooGravatar Craig Tiller2015-07-08
| | | | | | | | | | | | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | * | | merge head and resolve conflictGravatar yang-g2015-07-07
| | | | | | | | | | | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | * | | missed one placeGravatar yang-g2015-07-07
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Don’t use containsString as it’s iOS 8 onlyGravatar Jorge Canizales2015-07-07
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #2200 from jboeuf/slice_to_cstringGravatar Craig Tiller2015-07-07
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding util to get a NULL terminated string from a slice.
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #2242 from a-veitch/external_api_2Gravatar Craig Tiller2015-07-07
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | add client side census context
| | | | | | | | | * | | | | | | | | | | | | | Check more warnings in Ruby library, add -WerrorGravatar murgatroid992015-07-07
| | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | * | | resolve commentsGravatar yang-g2015-07-07
| | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | * | | | | | | | | | | | | | Fixed ruby local build fallback caseGravatar murgatroid992015-07-07
| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #2174 from nicolasnoble/makefile-npn-checkGravatar jboeuf2015-07-07
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a check to find NPN-capable OpenSSL.
| | | | | | | | | | | | | | | | | | * | | | | | Support older compilersGravatar Craig Tiller2015-07-07
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | * | | Merge remote-tracking branch 'upstream/master' into security_context2Gravatar yang-g2015-07-07
| | | | | | | | | | | | | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * | | | | | Support registering services against specific hostsGravatar Craig Tiller2015-07-07
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into slice_to_cstringGravatar Julien Boeuf2015-07-08
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | | | | | | | | | Use pkg-config if possible when building the ruby extensionGravatar murgatroid992015-07-07
| | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | | | | Fixing json doc.Gravatar Julien Boeuf2015-07-08
| |_|_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | | | Fix TSAN reported bugGravatar Craig Tiller2015-07-07
| |_|_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | * | | | Merge branch 'just-say-goodbye-when-we-are-done' into ↵Gravatar Craig Tiller2015-07-07
| | | | | | | | | | | |_|_|_|_|_|/| | | | | | | | | | | | | | |/| | | | | |/ / / / | | | | | |_|_|_|_|_|_|_|_|_|_|/| | | | | | | | |/| | | | | | | | | | | | | | | screw-you-guys-im-taking-my-own-lock
| | | | | | | | | | | | | | | | | | | * Merge github.com:grpc/grpc into ↵Gravatar Craig Tiller2015-07-07
| | | | | | | | | | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | help-help-im-stuck-and-i-cant-reach-my-tcp-connection
| | | | | | | | | | | | | | | * | | | | Merge github.com:grpc/grpc into metadata-wants-to-be-debuggedGravatar Craig Tiller2015-07-07
| | | | | | | | | | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * | Merge github.com:grpc/grpc into cmakeGravatar Craig Tiller2015-07-07
| | | | | | | | | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge branch 'just-say-goodbye-when-we-are-done' of github.com:ctiller/grpc ↵Gravatar Craig Tiller2015-07-07
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into just-say-goodbye-when-we-are-done
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'not-everyone-can-be-included' into ↵Gravatar Craig Tiller2015-07-07
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | just-say-goodbye-when-we-are-done Conflicts: src/core/transport/chttp2_transport.c
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge github.com:grpc/grpc into not-everyone-can-be-includedGravatar Craig Tiller2015-07-07
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |