From a7ad4f52189d89cfcba35f78bfc5ff3b1f4105c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <saghul@gmail.com>
Date: Fri, 11 Sep 2015 17:44:02 +0200
Subject: [PATCH] 2015.09.12, Version 1.7.4 (Stable)

Changes since version 1.7.3:

* doc: uv_read_start and uv_read_cb clarifications (Ben Trask)

* freebsd: obtain true uptime through clock_gettime() (Jianghua Yang)

* win, tty: do not convert \r to \r\n (Colin Snover)

* build,gyp: add DragonFly to the list of OSes (Michael Neumann)

* fs: fix bug in sendfile for DragonFly (Michael Neumann)

* doc: add uv_dlsym() return type (Brian White)

* tests: fix fs tests run w/o full getdents support (Jeremy Whitlock)

* doc: fix typo (Devchandra Meetei Leishangthem)

* doc: fix uv-unix.h location (Sakthipriyan Vairamani)

* unix: fix error check when closing process pipe fd (Ben Noordhuis)

* test,freebsd: fix ipc_listen_xx_write tests (Santiago Gimeno)

* win: fix unsavory rwlock fallback implementation (Bert Belder)

* doc: clarify repeat timer behavior (Eli Skeggs)
---
 .mailmap             |  1 +
 AUTHORS              |  5 +++++
 ChangeLog            | 31 +++++++++++++++++++++++++++++++
 appveyor.yml         |  2 +-
 configure.ac         |  2 +-
 include/uv-version.h |  2 +-
 6 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/.mailmap b/.mailmap
index f26ecc4d..eb9b5e0d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -8,6 +8,7 @@ Brian White <mscdex@mscdex.net>
 Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
 Caleb James DeLisle <cjd@hyperboria.ca> <cjd@cjdns.fr>
 Christoph Iserlohn <christoph.iserlohn@innoq.com>
+Devchandra Meetei Leishangthem <dlmeetei@gmail.com>
 Fedor Indutny <fedor.indutny@gmail.com> <fedor@indutny.com>
 Frank Denis <github@pureftpd.org>
 Isaac Z. Schlueter <i@izs.me>
diff --git a/AUTHORS b/AUTHORS
index 2c12c141..7f297b87 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -219,3 +219,8 @@ Zachary Hamm <zsh@imipolexg.org>
 Karl Skomski <karl@skomski.com>
 Jeremy Whitlock <jwhitlock@apache.org>
 Willem Thiart <himself@willemthiart.com>
+Ben Trask <bentrask@comcast.net>
+Jianghua Yang <jianghua.yjh@alibaba-inc.com>
+Colin Snover <github.com@zetafleet.com>
+Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
+Eli Skeggs <skeggse@gmail.com>
diff --git a/ChangeLog b/ChangeLog
index e9ebdecd..a43eca8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2015.09.12, Version 1.7.4 (Stable)
+
+Changes since version 1.7.3:
+
+* doc: uv_read_start and uv_read_cb clarifications (Ben Trask)
+
+* freebsd: obtain true uptime through clock_gettime() (Jianghua Yang)
+
+* win, tty: do not convert \r to \r\n (Colin Snover)
+
+* build,gyp: add DragonFly to the list of OSes (Michael Neumann)
+
+* fs: fix bug in sendfile for DragonFly (Michael Neumann)
+
+* doc: add uv_dlsym() return type (Brian White)
+
+* tests: fix fs tests run w/o full getdents support (Jeremy Whitlock)
+
+* doc: fix typo (Devchandra Meetei Leishangthem)
+
+* doc: fix uv-unix.h location (Sakthipriyan Vairamani)
+
+* unix: fix error check when closing process pipe fd (Ben Noordhuis)
+
+* test,freebsd: fix ipc_listen_xx_write tests (Santiago Gimeno)
+
+* win: fix unsavory rwlock fallback implementation (Bert Belder)
+
+* doc: clarify repeat timer behavior (Eli Skeggs)
+
+
 2015.08.28, Version 1.7.3 (Stable), 93877b11c8b86e0a6befcda83a54555c1e36e4f0
 
 Changes since version 1.7.2:
diff --git a/appveyor.yml b/appveyor.yml
index 87902833..e730e1ca 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: v1.7.3.build{build}
+version: v1.7.4.build{build}
 
 install:
   - cinst -y nsis
diff --git a/configure.ac b/configure.ac
index ad5cb008..54704a28 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.7.3], [https://github.com/libuv/libuv/issues])
+AC_INIT([libuv], [1.7.4], [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 90f2ce1f..f4d91e83 100644
--- a/include/uv-version.h
+++ b/include/uv-version.h
@@ -32,7 +32,7 @@
 
 #define UV_VERSION_MAJOR 1
 #define UV_VERSION_MINOR 7
-#define UV_VERSION_PATCH 3
+#define UV_VERSION_PATCH 4
 #define UV_VERSION_IS_RELEASE 1
 #define UV_VERSION_SUFFIX ""