Craig Tiller
a33333391a
Fix merge error
2017-01-26 13:16:37 -08:00
Craig Tiller
1e4f7652ce
Fix merge error
2017-01-26 12:55:08 -08:00
Craig Tiller
8cc1d01e9f
Merge github.com:grpc/grpc into rollfwd
2017-01-26 12:21:28 -08:00
Mark D. Roth
14fab048d6
Move parameters for all grpc_op types into their own sub-structs.
2017-01-25 10:44:30 -08:00
Craig Tiller
4b496b164c
Merge github.com:grpc/grpc into rollfwd
2017-01-24 10:53:20 -08:00
Nicolas "Pixel" Noble
4bd0d0594d
Changing versions from -dev to -pre1 on the release branch.
2017-01-23 23:52:35 +01:00
David G. Quintas
5f151daaa7
Merge pull request #9428 from grpc/revert-8842-metadata_filter
...
Revert "Metadata handling rewrite"
2017-01-23 12:08:46 -08:00
Nathaniel Manista
64467e95d2
v1.0.x → master upmerge
...
Manual resolution:
- Force use of local distributions in Python-building in
tools/run_tests/helper_scripts/build_python.sh.
2017-01-23 17:32:15 +00:00
Craig Tiller
a6009e33a8
Revert "Revert "Metadata handling rewrite""
...
This reverts commit 5e01e2ac977655aa074faf7fde0a74298f5e4c55.
2017-01-23 07:48:42 -08:00
Craig Tiller
2423da9e77
Revert "Metadata handling rewrite"
2017-01-20 18:11:52 -08:00
Craig Tiller
6b54221347
Merge github.com:grpc/grpc into metadata_filter
2017-01-17 08:13:14 -08:00
murgatroid99
4ea131cc4a
Merge branch 'master' into node_electron_build
2017-01-12 12:39:25 -08:00
Michael Lumish
06801bcbc2
Merge pull request #8981 from murgatroid99/node_glibcxx_compatibility
...
Replace usages of std::list with std::queue in Node extension
2017-01-11 16:30:37 -08:00
Craig Tiller
ee92e21526
Merge github.com:grpc/grpc into fix_errors
2017-01-06 13:59:30 -08:00
Eric Gribkoff
6c5a2dc668
Enable advanced Java interop tests.
...
Add response parameters to custom_metadata streaming request for Node and PHP
clients.
The Java server does not respond with separate initial and trailing
metadata when there is no response data - it is only emiting the
requested trailing metadata. Adding the response parameters to the test
(in accordance with the specification) avoids this, but I will open a
separate issue to investigate the Java behavior.
2017-01-06 09:16:29 -08:00
murgatroid99
8dcdee285d
Merge branch 'master' into node_electron_build
2017-01-04 15:43:02 -08:00
Craig Tiller
ce3b1befa9
Merge branch 'slice_with_exec_ctx' into metadata_filter
2016-12-27 08:59:00 -08:00
Nathaniel Manista
b74d3422b1
v1.0.x → master upmerge
...
Manual changes:
- Fixed use of Exception.message in _invalid_metadata_test.py
- Fixed merge of one_failed_as_unavailable in rpc_server_spec.rb
- Added "set -e" to generate_build_additions.sh
2016-12-16 23:48:52 +00:00
murgatroid99
6962aed6fa
Make event order consistent, and make 'end' and 'error' mutually exclusive
2016-12-13 18:05:33 -08:00
murgatroid99
12583421c7
Make Node extension work with slice changes
2016-12-12 17:40:22 -08:00
murgatroid99
0ea53cccdd
Perform quit operations in a useful order in Node perf tests
2016-12-06 14:18:21 -08:00
murgatroid99
bd31bf0baa
Replace usages of std::list with std::queue in Node extension
2016-12-06 11:00:39 -08:00
murgatroid99
f8e550ce4a
Merge branch 'master' into node_electron_build
2016-12-05 12:18:41 -08:00
murgatroid99
5c8df435fa
Add missing return
2016-12-01 10:59:52 -08:00
murgatroid99
15d4875138
Also propagate serialization errors in unary server responses
2016-12-01 10:30:35 -08:00
murgatroid99
d0402e0093
Node: correctly bubble up errors caused by non-serializable writes
2016-11-29 18:16:57 -08:00
murgatroid99
9579512d35
Make Node library compatible with lodash 3
2016-11-14 10:43:26 -08:00
murgatroid99
4ef1c5f130
Some slice and resource quota updates to UV and Node code
2016-11-09 15:12:22 -08:00
murgatroid99
48d662f2a5
Refactor uv/non-uv code in Node extension
2016-11-01 13:05:24 -07:00
murgatroid99
2299242811
Merge branch 'master' into node_electron_build
2016-11-01 11:13:58 -07:00
murgatroid99
b601e95c67
Add test scripts for electron
2016-11-01 11:05:02 -07:00
Craig Tiller
49c198784f
Merge github.com:grpc/grpc into grpc_slice
2016-10-31 14:42:53 -07:00
murgatroid99
22b2e81604
Merge remote-tracking branch 'upstream/v1.0.x' into v1.0.1_upmerge
2016-10-28 11:48:22 -07:00
Craig Tiller
de3e282363
Merge github.com:grpc/grpc into grpc_slice
2016-10-28 07:22:08 -07:00
Michael Lumish
be8fc813f9
Merge pull request #8419 from murgatroid99/node_express_benchmark
...
Add benchmark client and server for Node Express
2016-10-27 17:43:03 -07:00
Craig Tiller
963b340dda
s/GPR_SLICE/GRPC_SLICE/g
2016-10-26 21:08:10 -07:00
Craig Tiller
bcb4592ecb
Merge branch 'buffer_pools_for_realsies' into grpc_slice
2016-10-26 21:00:53 -07:00
Craig Tiller
d6813a8ee5
s/gpr_slice/grpc_slice, and move around tests, impls
2016-10-26 16:16:06 -07:00
Nicolas "Pixel" Noble
ead0505db5
Going 1.0.1.
2016-10-26 21:42:29 +02:00
murgatroid99
4f0ad464c0
Merge branch 'master' into node_electron_build
2016-10-26 10:31:14 -07:00
Noah Eisen
12b8b9f41d
Merge pull request #8449 from ncteisen/new_python_interop_tests
...
New python interop tests
2016-10-26 09:07:32 -07:00
Noah Eisen
ef116f0085
Remove status message check from node interop client
...
The node interop client was checking that the status message for
the test unimplemented_method was an empty string. This behavior
is not guaranteed, and thus the check should be removed.
2016-10-25 16:59:33 -07:00
murgatroid99
5eca1db662
Merge branch 'master' into uv_core_transport
2016-10-25 12:35:21 -07:00
Michael Lumish
0d67981587
Merge pull request #8220 from murgatroid99/node_remove_deprecated_function
...
Remove deprecated V8 function call in Node library
2016-10-25 08:57:52 -07:00
murgatroid99
f741272fd1
Remove deprecated V8 function call in Node library
2016-10-24 17:38:04 -07:00
murgatroid99
411c0193f0
Merge remote-tracking branch 'upstream/v1.0.x' into node_package_updates
2016-10-24 11:21:07 -07:00
Noah Eisen
6d754b22c5
added new test to interop_sanity_test.js
2016-10-24 11:11:54 -07:00
Noah Eisen
119fa4c33f
change unimplemented_method to unimplemented_service. Add real unimplemented_method test for node
2016-10-21 17:32:33 -07:00
murgatroid99
413bc731ed
Merge branch 'master' into uv_core_transport
2016-10-21 15:54:42 -07:00
Tim Ryan
cd84e7368a
Compiles with npm install --debug option.
2016-10-21 10:13:46 -07:00
