 murgatroid99
|
1be0437ea5
Merged changes from upstream/master
|
vor 10 Jahren |
|
Nicolas Noble
|
10441a9401
Merge pull request #2310 from murgatroid99/node_pkg_config
|
vor 10 Jahren |
|
Nicolas Noble
|
265d43041f
Merge pull request #2269 from murgatroid99/node_binding_gyp_fixes
|
vor 10 Jahren |
|
Nicolas Noble
|
8f047d192d
Merge pull request #2326 from ctiller/we-lost-our-sanity
|
vor 10 Jahren |
|
Vijay Pai
|
c6964b1d98
Merge pull request #2304 from ctiller/just-say-goodbye-when-we-are-done
|
vor 10 Jahren |
|
Michael Lumish
|
8311a0b548
Merge pull request #2325 from jcanizales/be-ios6-compatible
|
vor 10 Jahren |
|
Craig Tiller
|
8ebc34da6b
Restore sanity
|
vor 10 Jahren |
|
Jorge Canizales
|
c14c3191b7
Don’t use containsString as it’s iOS 8 only
|
vor 10 Jahren |
|
Craig Tiller
|
3b685b7448
Merge pull request #2200 from jboeuf/slice_to_cstring
|
vor 10 Jahren |
|
Craig Tiller
|
fab2764413
Merge pull request #2242 from a-veitch/external_api_2
|
vor 10 Jahren |
|
jboeuf
|
44a4ef3b5a
Merge pull request #2174 from nicolasnoble/makefile-npn-check
|
vor 10 Jahren |
|
Julien Boeuf
|
607359467f
Merge branch 'master' of https://github.com/grpc/grpc into slice_to_cstring
|
vor 10 Jahren |
|
Craig Tiller
|
550342f70d
Merge branch 'just-say-goodbye-when-we-are-done' of github.com:ctiller/grpc into just-say-goodbye-when-we-are-done
|
vor 10 Jahren |
|
Craig Tiller
|
ce9c4ee6db
Merge branch 'not-everyone-can-be-included' into just-say-goodbye-when-we-are-done
|
vor 10 Jahren |
|
Craig Tiller
|
c5b5290bc6
Merge github.com:grpc/grpc into not-everyone-can-be-included
|
vor 10 Jahren |
|
Yang Gao
|
772187cdf0
Merge pull request #2208 from ctiller/tis-but-thy-name
|
vor 10 Jahren |
|
Craig Tiller
|
298b0b93ff
Avoid finishing writes until data actually sent
|
vor 10 Jahren |
|
Craig Tiller
|
03b4bb9dfa
Merge github.com:grpc/grpc into tis-but-thy-name
|
vor 10 Jahren |
|
Craig Tiller
|
bea1e621a1
Fix Windows Crash
|
vor 10 Jahren |
|
Craig Tiller
|
4092564c33
Fix crash under Windows
|
vor 10 Jahren |
|
Vijay Pai
|
361d1a9b8a
Merge pull request #2306 from ctiller/reset-thy-counts-or-fear-my-wrath
|
vor 10 Jahren |
|
murgatroid99
|
06e5471aa4
Added other LDFLAGS to node gyp file
|
vor 10 Jahren |
|
Yang Gao
|
07a44c9d51
Merge pull request #2307 from ctiller/im-so-pretty
|
vor 10 Jahren |
|
murgatroid99
|
b771f91d60
Only use pkg-config if grpc is installed
|
vor 10 Jahren |
|
David G. Quintas
|
fc8c8dcc32
Merge pull request #2293 from ctiller/pack-your-bags
|
vor 10 Jahren |
|
Craig Tiller
|
f9899d27f8
Merge github.com:grpc/grpc into tis-but-thy-name
|
vor 10 Jahren |
|
Craig Tiller
|
be3da35369
Merge branch 'tis-but-thy-name' into just-say-goodbye-when-we-are-done
|
vor 10 Jahren |
|
Michael Lumish
|
cd54c60c08
Merge pull request #2291 from jcanizales/skylark-objc-library
|
vor 10 Jahren |
|
Craig Tiller
|
43f5ac6a28
Guard against double pollset shutdown completion
|
vor 10 Jahren |
|
Yang Gao
|
d426864934
Merge pull request #2279 from vjpai/openleaks
|
vor 10 Jahren |
