Repository navigation
Currently missing commits from joyent/node #832
Description
Are we still planning to merge joyent/node into io.js? Seems like it's going to be increasingly painful. If not, there are a few commits that I'd like to cherry pick over:
- nodejs/node-v0.x-archive@ad06848 - url: reslove urls with . and .. - this was actually discussed in url: fixing url resolve issue #278
- nodejs/node-v0.x-archive@f347573 - net: throw on invalid socket timeouts
- nodejs/node-v0.x-archive@430096a - doc: use correct signature for assert()
- nodejs/node-v0.x-archive@b8604fa - module: replace NativeModule.require
- nodejs/node-v0.x-archive@6c60a72 - doc: fix code syntax
- nodejs/node-v0.x-archive@d2b5461 - test: Timeout#unref() does not return instance
- nodejs/node-v0.x-archive@8d8a2f2 - doc: grammar fix in smalloc
- nodejs/node-v0.x-archive@25702ab - net: remove use of arguments in Server constructor
cc: @iojs/collaborators
Activity
bnoordhuis commentedon Feb 13, 2015
All the changes look reasonable to me. If you file them as a PR, I'll rubber-stamp LGTM^W^Wreview it.
cjihrig commentedon Feb 13, 2015
Closed in 0cff052, 8c1df7a, 6a2b204, 30dca66, 3b1b4de, 4ca7cca, and cca8de6