From 623715e315a6a9e0d670269c6896974efcd5f0a5 Mon Sep 17 00:00:00 2001
From: tidwall <joshbaker77@gmail.com>
Date: Fri, 26 Apr 2019 11:59:03 -0700
Subject: [PATCH] 1.17.0

---
 CHANGELOG.md | 12 +++++++++++-
 README.md    |  2 +-
 build.sh     |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 615f20ce..e3747d20 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,21 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.17.0] - 2019-04-26
+### Added
+- #446: Added timeouts to allow prepending commands with a TIMEOUT option. (@rshura)
+
+### Fixes
+- #440: Fixed crash with fence ROAM (@githubfr)
+
+### Changes
+- 3ae5927: Removed experimental evio option
+
+
 ## [1.16.4] - 2019-03-19
 ### Fixes
 - e1a7145: Hotfix. Do not ignore SIGHUP. Use the `--nohup` flag or `nohup` command.
 
-
 ## [1.16.3] - 2019-03-19
 ### Fixes
 - #437: Fixed clients blocking while webook sending. (@tesujiro)
diff --git a/README.md b/README.md
index 3fc415fd..a0e2e7e5 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 </p>
 <p align="center">
 <a href="https://join.slack.com/t/tile38/shared_invite/enQtMzQ0OTEwMDUxMzc5LTc0NTJjZmM3YjFhOGZiZGU2NDNjOWEwM2Q5ZWE3MzFiYWZkZDIyN2U2ZmUzZDBmODU0MjI1ZjQ0N2Y1M2I1NTg"><img src="https://img.shields.io/badge/slack-channel-orange.svg" alt="Slack Channel"></a>
-<a href="https://github.com/tidwall/tile38/releases"><img src="https://img.shields.io/badge/version-1.16.4-green.svg?" alt="Version"></a>
+<a href="https://github.com/tidwall/tile38/releases"><img src="https://img.shields.io/badge/version-1.17.0-green.svg?" alt="Version"></a>
 <a href="https://travis-ci.org/tidwall/tile38"><img src="https://travis-ci.org/tidwall/tile38.svg?branch=master" alt="Build Status"></a>
 <a href="https://hub.docker.com/r/tile38/tile38"><img src="https://img.shields.io/badge/docker-ready-blue.svg" alt="Docker Ready"></a>
 </p>
diff --git a/build.sh b/build.sh
index 455a9aa8..a9a3b47b 100755
--- a/build.sh
+++ b/build.sh
@@ -4,7 +4,7 @@ set -e
 cd $(dirname "${BASH_SOURCE[0]}")
 OD="$(pwd)"
 
-VERSION=1.16.4
+VERSION=1.17.0
 PROTECTED_MODE="no"
 
 # Hardcode some values to the core package