diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-07-09 14:28:05 -0700 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-07-09 14:28:05 -0700 |
| commit | 8d9897d735dcf808e5a32c9f376f4a993f8d0315 (patch) | |
| tree | 1496fd21e30e64343a5043722d0d2fed6639fd95 | |
| parent | 8bac8857f5c60e3af1a986f55912ce507b6135ba (diff) | |
| parent | e32660a984427d46af6a144983cf7b8045b7299c (diff) | |
| download | node-new-8d9897d735dcf808e5a32c9f376f4a993f8d0315.tar.gz | |
Merge branch 'v0.10.13-release' into v0.10
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | ChangeLog | 25 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/node_version.h | 2 |
4 files changed, 29 insertions, 3 deletions
@@ -455,3 +455,4 @@ Daniel G. Taylor <dan@programmer-art.org> Kiyoshi Nomo <tokyoincidents.g@gmail.com> Veres Lajos <vlajos@gmail.com> Yuan Chuan <yuanchuan23@gmail.com> +Peter Rust <peter@cornerstonenw.com> @@ -1,3 +1,28 @@ +2013.07.09, Version 0.10.13 (Stable) + +* uv: Upgrade to v0.10.12 + +* npm: Upgrade to 1.3.2 + +* windows: get proper errno (Ben Noordhuis) + +* tls: only wait for finish if we haven't seen it (Timothy J Fontaine) + +* http: Dump response when request is aborted (isaacs) + +* http: use an unref'd timer to fix delay in exit (Peter Rust) + +* zlib: level can be negative (Brian White) + +* zlib: allow zero values for level and strategy (Brian White) + +* buffer: add comment explaining buffer alignment (Ben Noordhuis) + +* string_bytes: properly detect 64bit (Timothy J Fontaine) + +* src: fix memory leak in UsingDomains() (Ben Noordhuis) + + 2013.06.18, Version 0.10.12 (Stable) * npm: Upgrade to 1.2.32 @@ -277,7 +277,7 @@ $(PKG): release-only rm -rf out/deps out/Release $(PYTHON) ./configure --without-snapshot --dest-cpu=x64 --tag=$(TAG) $(MAKE) install V=$(V) DESTDIR=$(PKGDIR) - SIGN="$(SIGN)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh + SIGN="$(APP_SIGN)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh lipo $(PKGDIR)/32/usr/local/bin/node \ $(PKGDIR)/usr/local/bin/node \ -output $(PKGDIR)/usr/local/bin/node-universal \ @@ -288,7 +288,7 @@ $(PKG): release-only --id "org.nodejs.Node" \ --doc tools/osx-pkg.pmdoc \ --out $(PKG) - SIGN="$(SIGN)" PKG="$(PKG)" bash tools/osx-productsign.sh + SIGN="$(INT_SIGN)" PKG="$(PKG)" bash tools/osx-productsign.sh $(TARBALL): release-only node doc git archive --format=tar --prefix=$(TARNAME)/ HEAD | tar xf - diff --git a/src/node_version.h b/src/node_version.h index 2e1d41a8f7..aa41dc78e6 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -26,7 +26,7 @@ #define NODE_MINOR_VERSION 10 #define NODE_PATCH_VERSION 13 -#define NODE_VERSION_IS_RELEASE 0 +#define NODE_VERSION_IS_RELEASE 1 #ifndef NODE_TAG # define NODE_TAG "" |