Skip to content

Commit b8c04b9

Browse files
bnoordhuisbnoordhuis
committed
Merge remote-tracking branch 'origin/v0.10'
Conflicts: AUTHORS ChangeLog deps/uv/ChangeLog deps/uv/src/version.c deps/uv/src/win/fs.c src/node.cc src/node_crypto.cc src/node_os.cc src/node_version.h
2 parents dc9acd4 + 6327d67 commit b8c04b9

209 files changed

Lines changed: 1579 additions & 1284 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎AUTHORS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,7 @@ Suwon Chae <doortts@gmail.com>
437437
David Braun <NodeJS-box@snkmail.com>
438438
Mitar Milutinovic <mitar.git@tnode.com>
439439
Michael Hart <michael.hart.au@gmail.com>
440+
Jeff Barczewski <jeff.barczewski@gmail.com>
440441
Andrew Hart <hartandrewr@gmail.com>
441442
Rafael Garcia <rgarcia2009@gmail.com>
442443
Tobias Müllerleile <tobias@muellerleile.net>
@@ -464,4 +465,4 @@ Yuan Chuan <yuanchuan23@gmail.com>
464465
Krzysztof Chrapka <chrapka.k@gmail.com>
465466
Linus Mårtensson <linus.martensson@sonymobile.com>
466467
Peter Rust <peter@cornerstonenw.com>
467-
Jeff Barczewski <jeff.barczewski@gmail.com>
468+
Shuan Wang <shuanwang@gmail.com>

‎ChangeLog‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
2013.07.25, Version 0.10.15 (Stable)
2+
3+
* src: fix process.getuid() return value (Ben Noordhuis)
4+
5+
6+
2013.07.25, Version 0.10.14 (Stable), fdf57f811f9683a4ec49a74dc7226517e32e6c9d
7+
8+
* uv: Upgrade to v0.10.13
9+
10+
* npm: Upgrade to v1.3.5
11+
12+
* os: Don't report negative times in cpu info (Ben Noordhuis)
13+
14+
* fs: Handle large UID and GID (Ben Noordhuis)
15+
16+
* url: Fix edge-case when protocol is non-lowercase (Shuan Wang)
17+
18+
* doc: Streams API Doc Rewrite (isaacs)
19+
20+
* node: call MakeDomainCallback in all domain cases (Trevor Norris)
21+
22+
* crypto: fix memory leak in LoadPKCS12 (Fedor Indutny)
23+
24+
125
2013.07.12, Version 0.11.4 (Unstable)
226

327
* npm: Upgrade to 1.3.4

‎deps/npm/doc/cli/npm-bin.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Print the folder where npm will install executables.
1313

1414
* npm-prefix(1)
1515
* npm-root(1)
16-
* npm-folders(7)
16+
* npm-folders(5)
1717
* npm-config(1)
1818
* npm-config(7)
1919
* npmrc(5)

‎deps/npm/doc/cli/npm-cache.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ The root cache folder.
6363

6464
## SEE ALSO
6565

66-
* npm-folders(7)
66+
* npm-folders(5)
6767
* npm-config(1)
6868
* npm-config(7)
6969
* npmrc(5)

‎deps/npm/doc/cli/npm-edit.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The command to run for `npm edit` or `npm config edit`.
2929

3030
## SEE ALSO
3131

32-
* npm-folders(7)
32+
* npm-folders(5)
3333
* npm-explore(1)
3434
* npm-install(1)
3535
* npm-config(1)

‎deps/npm/doc/cli/npm-explore.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The shell to run for the `npm explore` command.
3333
## SEE ALSO
3434

3535
* npm-submodule(1)
36-
* npm-folders(7)
36+
* npm-folders(5)
3737
* npm-edit(1)
3838
* npm-rebuild(1)
3939
* npm-build(1)

‎deps/npm/doc/cli/npm-help.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Set to `"browser"` to view html help content in the default web browser.
3131
* npm(1)
3232
* README
3333
* npm-faq(7)
34-
* npm-folders(7)
34+
* npm-folders(5)
3535
* npm-config(1)
3636
* npm-config(7)
3737
* npmrc(5)

‎deps/npm/doc/cli/npm-install.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ npm-install(1) -- Install a package
1111
npm install <name>@<tag>
1212
npm install <name>@<version>
1313
npm install <name>@<version range>
14-
npm install <name>@<version range>
1514

1615
## DESCRIPTION
1716

@@ -160,7 +159,7 @@ local copy exists on disk.
160159
npm install sax --force
161160

162161
The `--global` argument will cause npm to install the package globally
163-
rather than locally. See `npm-folders(7)`.
162+
rather than locally. See `npm-folders(5)`.
164163

165164
The `--link` argument will cause npm to link global installs into the
166165
local space in some cases.
@@ -202,7 +201,7 @@ this algorithm produces:
202201
That is, the dependency from B to C is satisfied by the fact that A
203202
already caused C to be installed at a higher level.
204203

205-
See npm-folders(7) for a more detailed description of the specific
204+
See npm-folders(5) for a more detailed description of the specific
206205
folder structures that npm creates.
207206

208207
### Limitations of npm's Install Algorithm
@@ -228,7 +227,7 @@ affects a real use-case, it will be investigated.
228227

229228
## SEE ALSO
230229

231-
* npm-folders(7)
230+
* npm-folders(5)
232231
* npm-update(1)
233232
* npm-link(1)
234233
* npm-rebuild(1)
@@ -238,7 +237,7 @@ affects a real use-case, it will be investigated.
238237
* npm-config(7)
239238
* npmrc(5)
240239
* npm-registry(7)
241-
* npm-folders(7)
240+
* npm-folders(5)
242241
* npm-tag(1)
243242
* npm-rm(1)
244243
* npm-shrinkwrap(1)

‎deps/npm/doc/cli/npm-link.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ installation target into your project's `node_modules` folder.
5656
* npm-faq(7)
5757
* package.json(5)
5858
* npm-install(1)
59-
* npm-folders(7)
59+
* npm-folders(5)
6060
* npm-config(1)
6161
* npm-config(7)
6262
* npmrc(5)

‎deps/npm/doc/cli/npm-ls.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ project.
6666
* npm-config(1)
6767
* npm-config(7)
6868
* npmrc(5)
69-
* npm-folders(7)
69+
* npm-folders(5)
7070
* npm-install(1)
7171
* npm-link(1)
7272
* npm-prune(1)

0 commit comments

Comments
 (0)