From eb454c8212147e850416844686be3ca7d3ae6491 Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Tue, 20 Dec 2016 15:12:09 +1100 Subject: [PATCH] 2016-12-21 Version 0.12.18 (Maintenance) Release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Notable changes: * npm: upgrade from v2.15.1 to v2.15.11, including accurate updated license (Jeremiah Senkpiel) * process: `process.versions.ares` now outputs the c-ares version (Johan Bergström) PR-URL: https://github.com/nodejs/node/pull/10352 --- ChangeLog | 17 +++++++++++++++++ src/node_version.h | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8ee69d1f9f1e1a..0284b9a185f414 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2016-12-21, Version 0.12.18 (Maintenance), @rvagg + +Notable changes: + +* npm: upgrade from v2.15.1 to v2.15.11, including accurate updated license (Jeremiah Senkpiel) +* process: `process.versions.ares` now outputs the c-ares version (Johan Bergström) + +Commits: + +* [a47fd4549d] - build: add working lint-ci make target (Rod Vagg) https://github.com/nodejs/node/pull/9151 +* [830584ca59] - deps: define missing operator delete functions (John Barboza) https://github.com/nodejs/node/pull/10356 +* [c130b31cba] - deps: upgrade npm to 2.15.11 (Jeremiah Senkpiel) https://github.com/nodejs/node/pull/9619 +* [bc6766d847] - doc: update npm license in main LICENSE file (Rod Vagg) https://github.com/nodejs/node/pull/10352 +* [0cdf344c80] - (SEMVER-MINOR) process: reintroduce ares to versions (Johan Bergström) https://github.com/nodejs/node/pull/9191 +* [d8e27ec30a] - test: mark dgram-multicast-multi-process as flaky (Rod Vagg) https://github.com/nodejs/node/pull/9150 +* [c722335ead] - tls: fix minor jslint failure (Rod Vagg) https://github.com/nodejs/node/pull/9107 + 2016-10-18, Version 0.12.17 (Maintenance), @rvagg This is a security release. All Node.js users should consult the security release summary at https://nodejs.org/en/blog/vulnerability/october-2016-security-releases/ for details on patched vulnerabilities. diff --git a/src/node_version.h b/src/node_version.h index 909d14fa87cdf4..4d61930f0fd558 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -26,7 +26,7 @@ #define NODE_MINOR_VERSION 12 #define NODE_PATCH_VERSION 18 -#define NODE_VERSION_IS_RELEASE 0 +#define NODE_VERSION_IS_RELEASE 1 #ifndef NODE_STRINGIFY #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)