Merge remote-tracking branch 'upstream/v0.10'

Conflicts:
	ChangeLog
	deps/uv/ChangeLog
	deps/uv/include/uv-darwin.h
	deps/uv/src/unix/fsevents.c
	deps/uv/src/unix/process.c
	deps/uv/src/version.c
	doc/api/addons.markdown
	doc/api/cluster.markdown
	doc/api/http.markdown
	lib/http.js
	lib/tls.js
	src/node_crypto.cc
	src/node_http_parser.cc
	src/node_version.h
	src/pipe_wrap.cc
	src/v8abbr.h
	src/v8ustack.d
	test/simple/test-http-pipeline-flood.js

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/fs.js b/lib/fs.js
index 0e915aaab..b92aa435b 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -543,7 +543,7 @@ fs.truncate = function(path, len, callback) {
     len = 0;
   }
   callback = maybeCallback(callback);
-  fs.open(path, 'w', function(er, fd) {
+  fs.open(path, 'r+', function(er, fd) {
     if (er) return callback(er);
     binding.ftruncate(fd, len, function(er) {
       fs.close(fd, function(er2) {
@@ -562,7 +562,7 @@ fs.truncateSync = function(path, len) {
     len = 0;
   }
   // allow error to be thrown, but still close fd.
-  var fd = fs.openSync(path, 'w');
+  var fd = fs.openSync(path, 'r+');
   try {
     var ret = fs.ftruncateSync(fd, len);
   } finally {