From 6a20bac412414330ce15dfbca3169b2ee64f0f47 Mon Sep 17 00:00:00 2001
From: Myles Borins <mylesborins@google.com>
Date: Fri, 21 Dec 2018 18:13:09 -0500
Subject: [PATCH] 2018-12-26, Version 11.6.0 (Current)

This is a special release to add a CLI flag to set the max http header size.
This should have been included in the 11.3.0 security release.

Notable Changes:

* cli:
  - add --max-http-header-size flag (cjihrig)
    https://github.com/nodejs/node/pull/24811

PR-URL: https://github.com/nodejs/node/pull/25175
---
 CHANGELOG.md                    |  3 ++-
 doc/api/cli.md                  |  2 +-
 doc/changelogs/CHANGELOG_V11.md | 17 +++++++++++++++++
 src/node_version.h              |  6 +++---
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29a5158bd74fc6..29c3832d89497a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,7 +28,8 @@ release.
 </tr>
 <tr>
     <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V11.md#11.5.0">11.5.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V11.md#11.5.1">11.5.1</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V11.md#11.5.0">11.5.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V11.md#11.4.0">11.4.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V11.md#11.3.0">11.3.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V11.md#11.2.0">11.2.0</a><br/>
diff --git a/doc/api/cli.md b/doc/api/cli.md
index cd171d9e3467b3..7e0ef03a5830ef 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -199,7 +199,7 @@ Specify the `file` of the custom [experimental ECMAScript Module][] loader.
 
 ### `--max-http-header-size=size`
 <!-- YAML
-added: REPLACEME
+added: v11.6.0
 -->
 
 Specify the maximum size, in bytes, of HTTP headers. Defaults to 8KB.
diff --git a/doc/changelogs/CHANGELOG_V11.md b/doc/changelogs/CHANGELOG_V11.md
index bbb8610acd43c6..0add20efed28c0 100644
--- a/doc/changelogs/CHANGELOG_V11.md
+++ b/doc/changelogs/CHANGELOG_V11.md
@@ -9,6 +9,7 @@
 </tr>
 <tr>
 <td>
+<a href="#11.5.1">11.5.1</a><br/>
 <a href="#11.5.0">11.5.0</a><br/>
 <a href="#11.4.0">11.4.0</a><br/>
 <a href="#11.3.0">11.3.0</a><br/>
@@ -32,6 +33,22 @@
   * [io.js](CHANGELOG_IOJS.md)
   * [Archive](CHANGELOG_ARCHIVE.md)
 
+<a id="11.5.0"></a>
+## 2018-12-26, Version 11.6.0 (Current), @MylesBorins
+
+This is a special release to add a CLI flag to set the max http header size.
+This should have been included in the 11.3.0 security release.
+
+### Notable Changes
+
+* **cli**: add --max-http-header-size flag (cjihrig) [#24811](https://github.com/nodejs/node/pull/24811)
+
+### Commits
+
+* [[`edd8bd0ee0`](https://github.com/nodejs/node/commit/edd8bd0ee0)] - **cli**: add --max-http-header-size flag (cjihrig) [#24811](https://github.com/nodejs/node/pull/24811)
+* [[`0057af293a`](https://github.com/nodejs/node/commit/0057af293a)] - **deps**: cherry-pick http\_parser\_set\_max\_header\_size (cjihrig) [#24811](https://github.com/nodejs/node/pull/24811)
+* [[`c80ac7fae3`](https://github.com/nodejs/node/commit/c80ac7fae3)] - **src**: add kUInteger parsing (Matteo Collina) [#24811](https://github.com/nodejs/node/pull/24811)
+
 <a id="11.5.0"></a>
 ## 2018-12-18, Version 11.5.0 (Current), @BethGriggs
 
diff --git a/src/node_version.h b/src/node_version.h
index d114f7eba64f63..38416c82697156 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -23,13 +23,13 @@
 #define SRC_NODE_VERSION_H_
 
 #define NODE_MAJOR_VERSION 11
-#define NODE_MINOR_VERSION 5
-#define NODE_PATCH_VERSION 1
+#define NODE_MINOR_VERSION 6
+#define NODE_PATCH_VERSION 0
 
 #define NODE_VERSION_IS_LTS 0
 #define NODE_VERSION_LTS_CODENAME ""
 
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)