aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:grpc/grpc into str_join_with_sepGravatar David Garcia Quintas2015-07-08
|\
| * Merge pull request #2309 from murgatroid99/makefile_pkg-config_libs_fixGravatar Nicolas Noble2015-07-08
| |\
| * \ Merge pull request #2337 from nicolasnoble/ruby-should-build-itself-properlyGravatar Michael Lumish2015-07-08
| |\ \
| | * | Fixing variable names discrepancy in ruby's extension builder.Gravatar Nicolas "Pixel" Noble2015-07-08
| |/ /
| * | Merge pull request #2318 from murgatroid99/ruby_pkg_configGravatar Nicolas Noble2015-07-08
| |\ \
| * \ \ Merge pull request #2331 from vjpai/ttyGravatar Craig Tiller2015-07-08
| |\ \ \
| | | | * 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
| |\ \ \ \
| * \ \ \ \ Merge pull request #2317 from jboeuf/fix_json_docGravatar Nicolas Noble2015-07-08
| |\ \ \ \ \
| | | | | * | Fixed ruby build when rebuilding C coreGravatar murgatroid992015-07-08
| * | | | | | Merge pull request #2302 from jcanizales/point-to-protobuf-headGravatar Michael Lumish2015-07-08
| |\ \ \ \ \ \
| | | | | | | * Merged changes from upstream/masterGravatar murgatroid992015-07-08
| | | | | | | |\ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge pull request #2310 from murgatroid99/node_pkg_configGravatar Nicolas Noble2015-07-08
| |\ \ \ \ \ \ \
| | | | | | * | | Merge non-tty path with Windows path since they do the same thingGravatar vjpai2015-07-08
| * | | | | | | | Merge pull request #2269 from murgatroid99/node_binding_gyp_fixesGravatar Nicolas Noble2015-07-08
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #2326 from ctiller/we-lost-our-sanityGravatar Nicolas Noble2015-07-08
| |\ \ \ \ \ \ \ \ \
| | | | | | | | * | | 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
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #2325 from jcanizales/be-ios6-compatibleGravatar Michael Lumish2015-07-08
| |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | Restore sanityGravatar Craig Tiller2015-07-08
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into str_join_with_sepGravatar David Garcia Quintas2015-07-08
|\| | | | | | | | | |
* | | | | | | | | | | Split function now takes slices as input, performs no allocsGravatar David Garcia Quintas2015-07-08
| | * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | Added gpr_strsplit (with tests)Gravatar David Garcia Quintas2015-07-07
| * | | | | | | | | | | Merge pull request #2242 from a-veitch/external_api_2Gravatar Craig Tiller2015-07-07
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | | | | | | | | | * | Check more warnings in Ruby library, add -WerrorGravatar murgatroid992015-07-07
| | | | | | | | | | * | Fixed ruby local build fallback caseGravatar murgatroid992015-07-07
* | | | | | | | | | | | PR comments + some more tests.Gravatar David Garcia Quintas2015-07-07
| * | | | | | | | | | | Merge pull request #2174 from nicolasnoble/makefile-npn-checkGravatar jboeuf2015-07-07
| |\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | Added convenience method gpr_strjoin_sepGravatar David Garcia Quintas2015-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' of github.com:ctiller/grpc i...Gravatar Craig Tiller2015-07-07
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch 'not-everyone-can-be-included' into just-say-goodbye-when-we-are...Gravatar Craig Tiller2015-07-07
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge github.com:grpc/grpc into not-everyone-can-be-includedGravatar Craig Tiller2015-07-07
| | | | | |\ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #2208 from ctiller/tis-but-thy-nameGravatar Yang Gao2015-07-07
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Avoid finishing writes until data actually sentGravatar Craig Tiller2015-07-07
| * | | | | | | | | | | | Merge github.com:grpc/grpc into tis-but-thy-nameGravatar Craig Tiller2015-07-07
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix Windows CrashGravatar Craig Tiller2015-07-07
| | | | | | | * | | | | | Fix crash under WindowsGravatar Craig Tiller2015-07-07
* | | | | | | | | | | | | Merge pull request #2306 from ctiller/reset-thy-counts-or-fear-my-wrathGravatar Vijay Pai2015-07-07
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| | | | | | | | | | * | | Added other LDFLAGS to node gyp fileGravatar murgatroid992015-07-06
* | | | | | | | | | | | | Merge pull request #2307 from ctiller/im-so-prettyGravatar Yang Gao2015-07-06
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * | | Only use pkg-config if grpc is installedGravatar murgatroid992015-07-06