Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Fix race in TCP connection | 2015-07-09 | |
* | Merge pull request #2313 from yang-g/security_context2 | 2015-07-09 | |
|\ | |||
| * | Makefile regeneration to pass sanity test | 2015-07-09 | |
* | | Merge pull request #2343 from ejona86/dont-build-netty | 2015-07-09 | |
|\ \ | |||
| | * | Add missing pieces | 2015-07-09 | |
| | * | Merge remote-tracking branch 'upstream/master' into security_context2 | 2015-07-09 | |
| | |\ | |_|/ |/| | | |||
| | * | Resolve comments | 2015-07-09 | |
* | | | Merge pull request #2338 from madongfly/android | 2015-07-09 | |
|\ \ \ | |||
* \ \ \ | Merge pull request #2315 from ctiller/screw-you-guys-im-taking-my-own-lock | 2015-07-09 | |
|\ \ \ \ | |||
* \ \ \ \ | Merge pull request #2271 from jboeuf/oauth2_access_token | 2015-07-08 | |
|\ \ \ \ \ | |||
* \ \ \ \ \ | Merge pull request #2320 from ctiller/hosts-need-names-too | 2015-07-08 | |
|\ \ \ \ \ \ | |||
* \ \ \ \ \ \ | Merge pull request #2308 from ctiller/metadata-wants-to-be-debugged | 2015-07-08 | |
|\ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ | Merge pull request #2259 from nicolasnoble/creating-a-jenkins-branch | 2015-07-08 | |
|\ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ | Merge pull request #2198 from tbetbetbe/interop-test-add-oauth2-auth-token | 2015-07-08 | |
|\ \ \ \ \ \ \ \ \ | |||
| | | | | * \ \ \ \ | Merge branch 'master' of github.com:grpc/grpc into oauth2_access_token | 2015-07-08 | |
| | | | | |\ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||
* | | | | | | | | | | Merge pull request #2344 from nicolasnoble/yay-we-have-macos-on-jenkins | 2015-07-08 | |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | Adding MacOS support in our run_jenkins script. | 2015-07-09 | |
|/ / / / / / / / / / | |||
* | | | | | | | | | | Merge pull request #2252 from jboeuf/jwt_verifier | 2015-07-08 | |
|\ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ | Merge pull request #2333 from murgatroid99/makefile_pkg-config_fix_perftool | 2015-07-08 | |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merged changes from master | 2015-07-08 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||
| | | | | | | | | | * | | For Docker grpc_java, no longer build Netty | 2015-07-08 | |
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||
| | * | | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into jwt_verifier | 2015-07-08 | |
| | |\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | |||
* | | | | | | | | | | | Merge pull request #2309 from murgatroid99/makefile_pkg-config_libs_fix | 2015-07-08 | |
|\ \ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #2337 from nicolasnoble/ruby-should-build-itself-properly | 2015-07-08 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | * | | Update dockerfile of gRpc Android interop test to use the code inside grpc-ja... | 2015-07-08 | |
| |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | Fixing variable names discrepancy in ruby's extension builder. | 2015-07-08 | |
|/ / / / / / / / / / / | |||
* | | | | | | | | | | | Merge pull request #2318 from murgatroid99/ruby_pkg_config | 2015-07-08 | |
|\ \ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #2331 from vjpai/tty | 2015-07-08 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | Fixed typo in variable name | 2015-07-08 | |
| | | * | | | | | | | | | | Merge branch 'master' into makefile_pkg-config_libs_fix | 2015-07-08 | |
| | | |\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |||
| | | * | | | | | | | | | | Added OpenSSL NPN pkg-config check | 2015-07-08 | |
| | * | | | | | | | | | | | Fixed Rubocop errors in extconf.rb | 2015-07-08 | |
* | | | | | | | | | | | | | Merge pull request #2316 from ctiller/tis-but-thy-name | 2015-07-08 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #2317 from jboeuf/fix_json_doc | 2015-07-08 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | * | | | | | | | | | | | Fixed ruby build when rebuilding C core | 2015-07-08 | |
* | | | | | | | | | | | | | | | Merge pull request #2302 from jcanizales/point-to-protobuf-head | 2015-07-08 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | * \ \ \ \ \ \ \ \ \ | Merged changes from upstream/master | 2015-07-08 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | Merge pull request #2310 from murgatroid99/node_pkg_config | 2015-07-08 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | * | | | | | | | | | | | | Merge non-tty path with Windows path since they do the same thing | 2015-07-08 | |
| | | | | | | | * | | | | | | | | | Don't use pkg-config to look for perftools | 2015-07-08 | |
| |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | Merge pull request #2269 from murgatroid99/node_binding_gyp_fixes | 2015-07-08 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #2326 from ctiller/we-lost-our-sanity | 2015-07-08 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | * | | | | | | | | | | | Stop sending terminal escape sequences if we're redirecting output to a file. | 2015-07-08 | |
| |_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | Merge pull request #2304 from ctiller/just-say-goodbye-when-we-are-done | 2015-07-08 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #2325 from jcanizales/be-ios6-compatible | 2015-07-08 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | | | | | * | | | | Remove extraneous explicit | 2015-07-08 | |
| | | | | | | | | | | | | | | * | | | | Update comments | 2015-07-08 | |
| | | * | | | | | | | | | | | | | | | | Restore sanity | 2015-07-08 | |
| |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||
| | | | | | | | | | | | | | * | | | | Fix Makefile | 2015-07-08 | |
| | | | | | | | | | | | | | * | | | | Merge github.com:grpc/grpc into hosts-need-names-too | 2015-07-08 | |
| | | | | | | | | | | | | | |\ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | |