yang-g
|
3315a845ef
|
Merge remote-tracking branch 'upstream/master' into security_context2
|
10 years ago |
yang-g
|
f9e8e59b1c
|
Resolve comments
|
10 years ago |
Eric Anderson
|
494886a1be
|
Merge pull request #2338 from madongfly/android
Update dockerfile of gRpc Android interop test to use the code inside grpc-java repository.
|
10 years ago |
Vijay Pai
|
a4ae29bb91
|
Merge pull request #2315 from ctiller/screw-you-guys-im-taking-my-own-lock
Split mu_call into a server-wide and a per-call lock
|
10 years ago |
Yang Gao
|
ec5a0ba6ba
|
Merge pull request #2271 from jboeuf/oauth2_access_token
Adding support for raw access token credentials.
|
10 years ago |
Yang Gao
|
19512b1feb
|
Merge pull request #2320 from ctiller/hosts-need-names-too
Support registering services against specific hosts
|
10 years ago |
Yang Gao
|
d130bdd176
|
Merge pull request #2308 from ctiller/metadata-wants-to-be-debugged
Add metadata refcount debug helpers
|
10 years ago |
Jan Tattermusch
|
7dbb4fc05d
|
Merge pull request #2259 from nicolasnoble/creating-a-jenkins-branch
Creating a branch during the Jenkins build to silence a warning.
|
10 years ago |
Abhishek Kumar
|
fb583d261d
|
Merge pull request #2198 from tbetbetbe/interop-test-add-oauth2-auth-token
Adds an interop test: oauth2_auth_token
|
10 years ago |
Julien Boeuf
|
a6b9a891a0
|
Merge branch 'master' of github.com:grpc/grpc into oauth2_access_token
|
10 years ago |
Jan Tattermusch
|
74a13ff1b8
|
Merge pull request #2344 from nicolasnoble/yay-we-have-macos-on-jenkins
Adding MacOS support in our run_jenkins script.
|
10 years ago |
Nicolas "Pixel" Noble
|
4853246ecb
|
Adding MacOS support in our run_jenkins script.
|
10 years ago |
Craig Tiller
|
1f8fc77d1a
|
Merge pull request #2252 from jboeuf/jwt_verifier
Adding JWT verifier.
|
10 years ago |
Craig Tiller
|
acdb001faf
|
Merge pull request #2333 from murgatroid99/makefile_pkg-config_fix_perftool
Don't use pkg-config to look for perftools
|
10 years ago |
murgatroid99
|
09e0f6063f
|
Merged changes from master
|
10 years ago |
Eric Anderson
|
c0944ddd19
|
For Docker grpc_java, no longer build Netty
In grpc/grpc-java#425 we will be removing the netty submodule.
|
10 years ago |
Julien Boeuf
|
ea94e46b0d
|
Merge branch 'master' of github.com:grpc/grpc into jwt_verifier
|
10 years ago |
Nicolas Noble
|
977565c2c0
|
Merge pull request #2309 from murgatroid99/makefile_pkg-config_libs_fix
Fix a few issues with pkg-config file generation
|
10 years ago |
Michael Lumish
|
aa9b3ac5c7
|
Merge pull request #2337 from nicolasnoble/ruby-should-build-itself-properly
Fixing variable names discrepancy in ruby's extension builder.
|
10 years ago |
murgatroid99
|
a5b482a8ec
|
Updated health check service with new changes
|
10 years ago |
Xudong Ma
|
bce7190631
|
Update dockerfile of gRpc Android interop test to use the code inside grpc-java repository.
|
10 years ago |
Julien Boeuf
|
b037bb6488
|
Adding tests and fixing mem leak in default creds.
|
10 years ago |
Nicolas "Pixel" Noble
|
21a38b4422
|
Fixing variable names discrepancy in ruby's extension builder.
CONFIG != GRPC_CONFIG, meaning we're always building released, even in debug.
|
10 years ago |
Nicolas Noble
|
617381a039
|
Merge pull request #2318 from murgatroid99/ruby_pkg_config
Use pkg-config if possible when building the ruby extension
|
10 years ago |
Craig Tiller
|
fc1a49a735
|
Merge pull request #2331 from vjpai/tty
Don't send terminal escapes if we're outputing to a file
|
10 years ago |
murgatroid99
|
71020daa93
|
Fixed typo in variable name
|
10 years ago |
murgatroid99
|
3fbb984722
|
Merge branch 'master' into makefile_pkg-config_libs_fix
|
10 years ago |
murgatroid99
|
5a79053244
|
Added OpenSSL NPN pkg-config check
|
10 years ago |
murgatroid99
|
0f1c42e381
|
Fixed Rubocop errors in extconf.rb
|
10 years ago |
Nicolas Noble
|
874e5f87ff
|
Merge pull request #2316 from ctiller/tis-but-thy-name
Fix TSAN reported bug
|
10 years ago |
Nicolas Noble
|
9f0724db89
|
Merge pull request #2317 from jboeuf/fix_json_doc
Fixing json doc.
|
10 years ago |
murgatroid99
|
9e56ce034f
|
Fixed ruby build when rebuilding C core
|
10 years ago |
Michael Lumish
|
443f58e37b
|
Merge pull request #2302 from jcanizales/point-to-protobuf-head
Point tests to protobuf head
|
10 years ago |
murgatroid99
|
1be0437ea5
|
Merged changes from upstream/master
|
10 years ago |
Nicolas Noble
|
10441a9401
|
Merge pull request #2310 from murgatroid99/node_pkg_config
Use pkg-config when building the Node extension, if possible
|
10 years ago |
vjpai
|
a29d2d7c33
|
Merge non-tty path with Windows path since they do the same thing
|
10 years ago |
murgatroid99
|
6d9e401158
|
Don't use pkg-config to look for perftools
|
10 years ago |
Nicolas Noble
|
265d43041f
|
Merge pull request #2269 from murgatroid99/node_binding_gyp_fixes
Node binding gyp fixes
|
10 years ago |
Nicolas Noble
|
8f047d192d
|
Merge pull request #2326 from ctiller/we-lost-our-sanity
Restore sanity
|
10 years ago |
vjpai
|
b461145b79
|
Stop sending terminal escape sequences if we're redirecting output to a file.
|
10 years ago |
Vijay Pai
|
c6964b1d98
|
Merge pull request #2304 from ctiller/just-say-goodbye-when-we-are-done
Change transport contract to automatically disconnect after sending a goaway
|
10 years ago |
Michael Lumish
|
8311a0b548
|
Merge pull request #2325 from jcanizales/be-ios6-compatible
Don’t use containsString as it’s iOS 8 only
|
10 years ago |
Craig Tiller
|
ab54f793ff
|
Reduce spam
|
10 years ago |
Craig Tiller
|
cdc8e94733
|
Merge branch 'just-say-goodbye-when-we-are-done' into be-less-verbose
|
10 years ago |
Craig Tiller
|
b09caa967d
|
Remove extraneous explicit
|
10 years ago |
Craig Tiller
|
2ee8f0b978
|
Update comments
|
10 years ago |
Craig Tiller
|
8ebc34da6b
|
Restore sanity
|
10 years ago |
Craig Tiller
|
62fa7268d2
|
Fix Makefile
|
10 years ago |
Craig Tiller
|
98d60fcb9a
|
Merge github.com:grpc/grpc into hosts-need-names-too
|
10 years ago |
yang-g
|
ab575d46f7
|
merge head and resolve conflict
|
10 years ago |