From c51fd3f66bbb386a1efdeba6812789f35a372d1e Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Sun, 22 Apr 2018 13:58:18 -0400
Subject: [PATCH] 2018.04.23, Version 1.20.2 (Stable)

Changes since version 1.20.1:

* zos: use custom semaphore (jBarz)

* win: fix registry API error handling (Kyle Farnung)

* build: add support for 64-bit AIX (Richard Lau)

* aix: guard STATIC_ASSERT for glibc work around (Richard Lau)
---
 AUTHORS              |  1 +
 ChangeLog            | 13 +++++++++++++
 configure.ac         |  2 +-
 include/uv-version.h |  4 ++--
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index bb564ac75..ba360e3f7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -336,3 +336,4 @@ Bob Burger <rgburger@beckman.com>
 Thomas Versteeg <thomasversteeg@gmx.com>
 zzzjim <zzzjim@users.noreply.github.com>
 Alex Arslan <ararslan@comcast.net>
+Kyle Farnung <kfarnung@microsoft.com>
diff --git a/ChangeLog b/ChangeLog
index 8ea21600c..e5d3656fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2018.04.23, Version 1.20.2 (Stable)
+
+Changes since version 1.20.1:
+
+* zos: use custom semaphore (jBarz)
+
+* win: fix registry API error handling (Kyle Farnung)
+
+* build: add support for 64-bit AIX (Richard Lau)
+
+* aix: guard STATIC_ASSERT for glibc work around (Richard Lau)
+
+
 2018.04.19, Version 1.20.1 (Stable), 36ac2fc8edfd5ff3e9be529be1d4a3f0d5364e94
 
 Changes since version 1.20.0:
diff --git a/configure.ac b/configure.ac
index 28fda9d39..f4d97daab 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.20.1], [https://github.com/libuv/libuv/issues])
+AC_INIT([libuv], [1.20.2], [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 daf7eeeb6..18f40da89 100644
--- a/include/uv-version.h
+++ b/include/uv-version.h
@@ -33,8 +33,8 @@
 #define UV_VERSION_MAJOR 1
 #define UV_VERSION_MINOR 20
 #define UV_VERSION_PATCH 2
-#define UV_VERSION_IS_RELEASE 0
-#define UV_VERSION_SUFFIX "dev"
+#define UV_VERSION_IS_RELEASE 1
+#define UV_VERSION_SUFFIX ""
 
 #define UV_VERSION_HEX  ((UV_VERSION_MAJOR << 16) | \
                          (UV_VERSION_MINOR <<  8) | \