Merge remote-tracking branch 'origin/v0.10'
authorBen Noordhuis <info@bnoordhuis.nl>
Fri, 5 Jul 2013 00:40:39 +0000 (02:40 +0200)
committerBen Noordhuis <info@bnoordhuis.nl>
Fri, 5 Jul 2013 00:40:39 +0000 (02:40 +0200)
Conflicts:
lib/buffer.js
lib/http.js
src/node.cc

1  2 
configure
doc/api/tls.markdown
doc/api/vm.markdown
src/node.cc

diff --cc configure
Simple merge
Simple merge
Simple merge
diff --cc src/node.cc
@@@ -883,8 -919,9 +883,9 @@@ Handle<Value> SetupDomainUse(const Argu
    Local<Function> ndt = ndt_v.As<Function>();
    process->Set(String::New("_tickCallback"), tdc);
    process->Set(String::New("nextTick"), ndt);
 -  process_tickCallback.Dispose();  // Possibly already set by MakeCallback().
 -  process_tickCallback = Persistent<Function>::New(tdc);
 -  return Undefined();
++  process_tickCallback.Dispose(node_isolate);  // May be set by MakeCallback().
 +  process_tickCallback = Persistent<Function>::New(node_isolate, tdc);
 +  return Undefined(node_isolate);
  }