Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:grpc/grpc into str_join_with_sep | David Garcia Quintas | 2015-07-08 |
|\ | |||
| * | Merge pull request #2309 from murgatroid99/makefile_pkg-config_libs_fix | Nicolas Noble | 2015-07-08 |
| |\ | |||
| * \ | Merge pull request #2337 from nicolasnoble/ruby-should-build-itself-properly | Michael Lumish | 2015-07-08 |
| |\ \ | |||
| | * | | Fixing variable names discrepancy in ruby's extension builder. | Nicolas "Pixel" Noble | 2015-07-08 |
| |/ / | |||
| * | | Merge pull request #2318 from murgatroid99/ruby_pkg_config | Nicolas Noble | 2015-07-08 |
| |\ \ | |||
| * \ \ | Merge pull request #2331 from vjpai/tty | Craig Tiller | 2015-07-08 |
| |\ \ \ | |||
| | | | * | Fixed typo in variable name | murgatroid99 | 2015-07-08 |
| | | | * | Merge branch 'master' into makefile_pkg-config_libs_fix | murgatroid99 | 2015-07-08 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | | | * | Added OpenSSL NPN pkg-config check | murgatroid99 | 2015-07-08 |
| | | * | | Fixed Rubocop errors in extconf.rb | murgatroid99 | 2015-07-08 |
| * | | | | Merge pull request #2316 from ctiller/tis-but-thy-name | Nicolas Noble | 2015-07-08 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge pull request #2317 from jboeuf/fix_json_doc | Nicolas Noble | 2015-07-08 |
| |\ \ \ \ \ | |||
| | | | | * | | Fixed ruby build when rebuilding C core | murgatroid99 | 2015-07-08 |
| * | | | | | | Merge pull request #2302 from jcanizales/point-to-protobuf-head | Michael Lumish | 2015-07-08 |
| |\ \ \ \ \ \ | |||
| | | | | | | * | Merged changes from upstream/master | murgatroid99 | 2015-07-08 |
| | | | | | | |\ | | |_|_|_|_|_|/ | |/| | | | | | | |||
| * | | | | | | | Merge pull request #2310 from murgatroid99/node_pkg_config | Nicolas Noble | 2015-07-08 |
| |\ \ \ \ \ \ \ | |||
| | | | | | * | | | Merge non-tty path with Windows path since they do the same thing | vjpai | 2015-07-08 |
| * | | | | | | | | Merge pull request #2269 from murgatroid99/node_binding_gyp_fixes | Nicolas Noble | 2015-07-08 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge pull request #2326 from ctiller/we-lost-our-sanity | Nicolas Noble | 2015-07-08 |
| |\ \ \ \ \ \ \ \ \ | |||
| | | | | | | | * | | | Stop sending terminal escape sequences if we're redirecting output to a file. | vjpai | 2015-07-08 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||
| * | | | | | | | | | Merge pull request #2304 from ctiller/just-say-goodbye-when-we-are-done | Vijay Pai | 2015-07-08 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #2325 from jcanizales/be-ios6-compatible | Michael Lumish | 2015-07-08 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| | | | * | | | | | | | | Restore sanity | Craig Tiller | 2015-07-08 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into str_join_with_sep | David Garcia Quintas | 2015-07-08 |
|\| | | | | | | | | | | |||
* | | | | | | | | | | | Split function now takes slices as input, performs no allocs | David Garcia Quintas | 2015-07-08 |
| | * | | | | | | | | | Don’t use containsString as it’s iOS 8 only | Jorge Canizales | 2015-07-07 |
| * | | | | | | | | | | Merge pull request #2200 from jboeuf/slice_to_cstring | Craig Tiller | 2015-07-07 |
| |\ \ \ \ \ \ \ \ \ \ | |||
* | | | | | | | | | | | | Added gpr_strsplit (with tests) | David Garcia Quintas | 2015-07-07 |
| * | | | | | | | | | | | Merge pull request #2242 from a-veitch/external_api_2 | Craig Tiller | 2015-07-07 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||
| | | | | | | | | | * | | Check more warnings in Ruby library, add -Werror | murgatroid99 | 2015-07-07 |
| | | | | | | | | | * | | Fixed ruby local build fallback case | murgatroid99 | 2015-07-07 |
* | | | | | | | | | | | | PR comments + some more tests. | David Garcia Quintas | 2015-07-07 |
| * | | | | | | | | | | | Merge pull request #2174 from nicolasnoble/makefile-npn-check | jboeuf | 2015-07-07 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
* | | | | | | | | | | | | | Added convenience method gpr_strjoin_sep | David Garcia Quintas | 2015-07-07 |
|/ / / / / / / / / / / / | |||
| | | * | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into slice_to_cstring | Julien Boeuf | 2015-07-08 |
| | | |\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | |||
| | | | | | | | | | * | | Use pkg-config if possible when building the ruby extension | murgatroid99 | 2015-07-07 |
| | | | | | | | * | | | | Fixing json doc. | Julien Boeuf | 2015-07-08 |
| |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |||
| | | | | | | | * | | | Fix TSAN reported bug | Craig Tiller | 2015-07-07 |
| |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||
| | | | * | | | | | | Merge branch 'just-say-goodbye-when-we-are-done' of github.com:ctiller/grpc i... | Craig Tiller | 2015-07-07 |
| | | | |\ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ | Merge branch 'not-everyone-can-be-included' into just-say-goodbye-when-we-are... | Craig Tiller | 2015-07-07 |
| | | | |\ \ \ \ \ \ \ | |||
| | | | | * \ \ \ \ \ \ | Merge github.com:grpc/grpc into not-everyone-can-be-included | Craig Tiller | 2015-07-07 |
| | | | | |\ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | Merge pull request #2208 from ctiller/tis-but-thy-name | Yang Gao | 2015-07-07 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | Avoid finishing writes until data actually sent | Craig Tiller | 2015-07-07 |
| * | | | | | | | | | | | | Merge github.com:grpc/grpc into tis-but-thy-name | Craig Tiller | 2015-07-07 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | Fix Windows Crash | Craig Tiller | 2015-07-07 |
| | | | | | | * | | | | | | Fix crash under Windows | Craig Tiller | 2015-07-07 |
* | | | | | | | | | | | | | Merge pull request #2306 from ctiller/reset-thy-counts-or-fear-my-wrath | Vijay Pai | 2015-07-07 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |||
| | | | | | | | | | * | | | Added other LDFLAGS to node gyp file | murgatroid99 | 2015-07-06 |
* | | | | | | | | | | | | | Merge pull request #2307 from ctiller/im-so-pretty | Yang Gao | 2015-07-06 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | * | | | Only use pkg-config if grpc is installed | murgatroid99 | 2015-07-06 |