From 1489c98b7fc17f1702821a269eb0c5e730c5c813 Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Thu, 30 Nov 2017 21:07:38 -0500
Subject: [PATCH] 2017.12.02, Version 1.18.0 (Stable)

Changes since version 1.17.0:

* aix: fix -Wmaybe-uninitialized warning (cjihrig)

* doc: remove note about SIGWINCH on Windows (Bartosz Sosnowski)

* Revert "unix,win: wait for threads to start" (Ben Noordhuis)

* unix,win: add uv_os_getpid() (Bartosz Sosnowski)

* unix: remove incorrect assertion in uv_shutdown() (Jameson Nash)

* doc: fix IRC URL in CONTRIBUTING.md (Matt Harrison)
---
 AUTHORS              |  1 +
 ChangeLog            | 17 +++++++++++++++++
 appveyor.yml         |  2 +-
 configure.ac         |  2 +-
 include/uv-version.h |  8 ++++----
 5 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 4e15bc478..b227123e4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -320,3 +320,4 @@ rayrase <rmartinez2175@eagle.fgcu.edu>
 Pekka Nikander <pekka.nikander@iki.fi>
 Ed Schouten <ed@nuxi.nl>
 Xu Meng <mengxumx@cn.ibm.com>
+Matt Harrison <hi@matt-harrison.com>
diff --git a/ChangeLog b/ChangeLog
index c9863550f..9e73bb3a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2017.12.02, Version 1.18.0 (Stable)
+
+Changes since version 1.17.0:
+
+* aix: fix -Wmaybe-uninitialized warning (cjihrig)
+
+* doc: remove note about SIGWINCH on Windows (Bartosz Sosnowski)
+
+* Revert "unix,win: wait for threads to start" (Ben Noordhuis)
+
+* unix,win: add uv_os_getpid() (Bartosz Sosnowski)
+
+* unix: remove incorrect assertion in uv_shutdown() (Jameson Nash)
+
+* doc: fix IRC URL in CONTRIBUTING.md (Matt Harrison)
+
+
 2017.11.25, Version 1.17.0 (Stable), 1344d2bb82e195d0eafc0b40ba103f18dfd04cc5
 
 Changes since version 1.16.1:
diff --git a/appveyor.yml b/appveyor.yml
index 5cb1edbb1..f77e640eb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: v1.17.0.build{build}
+version: v1.18.0.build{build}
 
 init:
   - git config --global core.autocrlf true
diff --git a/configure.ac b/configure.ac
index 30e4a9b91..7eb1674db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_PREREQ(2.57)
-AC_INIT([libuv], [1.17.0], [https://github.com/libuv/libuv/issues])
+AC_INIT([libuv], [1.18.0], [https://github.com/libuv/libuv/issues])
 AC_CONFIG_MACRO_DIR([m4])
 m4_include([m4/libuv-extra-automake-flags.m4])
 m4_include([m4/as_case.m4])
diff --git a/include/uv-version.h b/include/uv-version.h
index 97c88d360..831ee54de 100644
--- a/include/uv-version.h
+++ b/include/uv-version.h
@@ -31,10 +31,10 @@
  */
 
 #define UV_VERSION_MAJOR 1
-#define UV_VERSION_MINOR 17
-#define UV_VERSION_PATCH 1
-#define UV_VERSION_IS_RELEASE 0
-#define UV_VERSION_SUFFIX "dev"
+#define UV_VERSION_MINOR 18
+#define UV_VERSION_PATCH 0
+#define UV_VERSION_IS_RELEASE 1
+#define UV_VERSION_SUFFIX ""
 
 #define UV_VERSION_HEX  ((UV_VERSION_MAJOR << 16) | \
                          (UV_VERSION_MINOR <<  8) | \