Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Native core subtree graft. #11

Merged
merged 1,008 commits into from
Sep 11, 2017
Merged

Native core subtree graft. #11

merged 1,008 commits into from
Sep 11, 2017

Conversation

nicolasnoble
Copy link
Member

No description provided.

nicolasnoble and others added 30 commits August 20, 2016 01:45
@nicolasnoble
Merge branch 'v1.0.x' of https://github.com/grpc/grpc
83f5f39
@hacfi
Fix typo in node.js README
dc9eded
@murgatroid99
Add a libuv endpoint to the C core, for use in the Node library
4159622
@murgatroid99
Merge branch 'master' into uv_core_transport
e6d7d78
@murgatroid99
Fix mismatched new[] and delete in Node extension code
bc2693e
@murgatroid99
Merge branch 'master' into uv_core_transport
be51c29
@tcr
Compiles with npm install --debug option.
82f490c
@murgatroid99
Remove deprecated V8 function call in Node library
780c16a
@murgatroid99
UV tests pass on linux
84505a9
@murgatroid99
Fix how Node touches an internal core header
b9a3672
@jtattermusch
Update README.md
6ad0350
@jtattermusch
Merge pull request #8354 from grpc/v1.0.x
50ac047 
Upmerge doc changes from v1.0.x
@murgatroid99
Merge branch 'master' into uv_core_transport
e91c255
@murgatroid99
Create benchmark client and server for Node Express
77318b1
@murgatroid99
Fix issues with express benchmark and synchronize package.json with t…
5280def 
…emplate
@murgatroid99
Merge pull request #8208 from tcr/master
4c016b1 
Compiles with npm install --debug option.
@tcr @murgatroid99
Compiles with npm install --debug option.
cd84e73
@murgatroid99
Merge branch 'master' into uv_core_transport
413bc73
@ncteisen
change unimplemented_method to unimplemented_service. Add real unimpl…
119fa4c 
…emented_method test for node
@ncteisen
added new test to interop_sanity_test.js
6d754b2
@murgatroid99
Merge remote-tracking branch 'upstream/v1.0.x' into node_package_updates
411c019
@murgatroid99
Remove deprecated V8 function call in Node library
f741272
@murgatroid99
Merge pull request #8220 from murgatroid99/node_remove_deprecated_fun…
0d67981 
…ction

Remove deprecated V8 function call in Node library
@murgatroid99
Merge branch 'master' into uv_core_transport
5eca1db
@ncteisen
Remove status message check from node interop client
ef116f0 
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.
@ncteisen
Merge pull request #8449 from ncteisen/new_python_interop_tests
12b8b9f 
New python interop tests
@murgatroid99
Merge branch 'master' into node_electron_build
4f0ad46
@nicolasnoble
Going 1.0.1.
ead0505
@ctiller
s/gpr_slice/grpc_slice, and move around tests, impls
d6813a8
@ctiller
Merge branch 'buffer_pools_for_realsies' into grpc_slice
bcb4592
murgatroid99 and others added 17 commits June 19, 2017 14:57
@murgatroid99
Merge pull request #11536 from murgatroid99/node_fix_racy_test
5cca21a 
Fix racy Node reconnect test
@kpayson64
Bump to version 1.4.0
c633e30
@kpayson64
Merge pull request #11548 from kpayson64/bump_version_1_4_0
addddea 
Bump to version 1.4.0
@murgatroid99
Node: fix status memory leak, improve tcp_uv read buffer allocation code
173f7a3
@murgatroid99
Bump version to 1.4.1
ded4599
@murgatroid99
Merge remote-tracking branch 'upstream/v1.4.x' into master_1.4.1_upmerge
128ed76
@mehrdada
Use https://grpc.io consistently as the canonical URL
47754bd
@ctiller
Strawman OWNERS --> CODEOWNERS script
4290654
@ctiller
Reset OWNERS state
e3699f9
@markdroth
Add cancellation to asynchronous security APIs.
4052d67
@murgatroid99
Node: fix segfault with incorrect status argument types
02a085e
@murgatroid99
Node: replace custom deprecation warning with existing solution
417f861
@murgatroid99
Split tests more granularly
a3d649c
@connor4312
Node: document that root_certs in createSsl is optional
418e575 
It appears that omitting it causes grpc to use the hosts' default cert data.
This was brought up (as I had implemented this method incorrectly) in:
microsoft/etcd3#28 (comment)
minor fix
069ba65
Merge branch 'master' into tsi_grpc
917cd86
@murgatroid99
Merge pull request #12003 from murgatroid99/node_fix_batch_argument_s…
2ce6053 
…egfault

Node: fix segfault with incorrect status argument types
@murgatroid99 murgatroid99 mentioned this pull request Aug 31, 2017
Closed
13 tasks
@kjin
Copy link
Contributor

kjin commented Sep 5, 2017

Would you want to include package.json and binding.gyp in this as well?

@nicolasnoble
Copy link
Member Author

Updated the PR with the latest commits from the origin repository. The only change was the version number.

@kjin: we'll do these changes in subsequent PRs. This is really about moving history back in here.

@kjin
Copy link
Contributor

kjin commented Sep 11, 2017

Ok - I thought you'd want to preserve the history of package.json and binding.gyp as well.

Is there anything you'd want me to double-check? IE is this PR meant to be reviewable?

@murgatroid99 murgatroid99 merged commit dc76b51 into grpc:master Sep 11, 2017
@nicolasnoble nicolasnoble mentioned this pull request Sep 11, 2017
Merged
@lock lock bot locked as resolved and limited conversation to collaborators Jan 18, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@murgatroid99 murgatroid99 Awaiting requested review from murgatroid99

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet