daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,335 Commits
52 Branches
862 Tags
1.9 GiB
Commit Graph

23 Commits (78e38f59ad9f7fbb6a68a5f254aec7d9bae428c3)

Author SHA1 Message Date
Timothy J Fontaine 61ccaf9a97 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
 2013-10-25 11:26:05 -07:00
Ben Noordhuis 9a3a0ccc50 doc: expand os.loadavg() section 
Add a short explanation of what the load average is and why it's
unavailable on Windows.

Also sneak in a fix for a typo that I introduced in commit 56c5806.
 2013-10-15 10:17:23 +02:00
Ben Noordhuis 56c5806da3 doc: document os.loadavg() behavior on windows 
The load average is a very UNIX-y concept.  That's why os.loadavg()
always returns zeros on Windows.  Mention that in the documentation.
 2013-10-14 12:14:51 +02:00
Brian White 30701d6e74 os: add mac address to networkInterfaces() output 2013-08-01 12:47:05 +02:00
Maciej Małecki d713db245b doc: document possible return values of os.arch() 2013-07-26 17:55:55 -07:00
Ben Kelly 8a407f58b9 os: Include netmask in os.networkInterfaces() 
re #3765 and #5432
fixes #4743
 2013-05-08 17:04:29 -07:00
Ben Noordhuis 3fe6aba558 os: rename tmpDir() to tmpdir() for consistency 
Make the casing consistent with the other os.* functions but keep
os.tmpDir() around as an alias.
 2013-01-30 04:24:58 +01:00
Tim Bradshaw e6acfed9cc doc: os.cpus() returns times in milliseconds 2013-01-08 05:38:36 +01:00
Nathan Rajlich 5e4e87ade5 os: add os.endianness() function 2012-11-08 12:31:45 -08:00
isaacs a11bf99ce0 Fix #3407 os.tmpDir() 2012-06-12 19:08:47 -07:00
Mustansir Golawala 7ee15457ed os: add cross platform EOL character 2012-04-14 23:17:38 +02:00
isaacs 2d44dcc8be doc: Add stability indicators to documentation 2012-03-03 17:03:52 -08:00
isaacs 8a121fa0e7 doc refactor: os 2012-02-29 16:04:52 -08:00
Ben Noordhuis 37bb37d151 os: rename getNetworkInterfaces() to networkInterfaces() 2011-11-01 18:10:06 +01:00
Robert Mustacchi 317653b4df Rework getNetworkInterfaces() for Linux, SunOS, Mac OS X 2011-05-20 08:34:18 -07:00
isaacs a7ce79124e Add arch/platform to os module 2011-04-26 20:04:32 -07:00
Ryan Dahl 19e53512b8 os.getNetworkInterfaces() 2011-03-16 16:34:12 -07:00
Ryan Dahl 9bcfc0745c Revert "Implement os.isWindows" 
This reverts commit 9e31e0837e.

Use process.platform == 'win32'
 2011-01-13 20:32:36 -08:00
Bert Belder 9e31e0837e Implement os.isWindows 2011-01-04 18:38:58 -08:00
Brian White d75c338dd6 Add more functionality to the os module 2010-12-22 11:01:25 -08:00
Ryan Dahl c9e5cfcc34 Random doc fixes 2010-12-11 02:32:48 -08:00
Ryan Dahl 4f2ab03e97 Fix typo 2010-12-11 00:56:58 -08:00
Brian White f1762ff815 Add os module and getHostname 2010-12-11 00:51:20 -08:00