From b4bf9240802f52e2baea3dbaeb15e9c7b2020af8 Mon Sep 17 00:00:00 2001
From: Evan Phoenix <evan@phx.io>
Date: Sun, 24 Jul 2016 22:12:22 -0700
Subject: [PATCH] Bump to 3.6.0

---
 History.txt       | 16 ++++++++++++++++
 lib/puma/const.rb |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/History.txt b/History.txt
index ff8c2d93..f7c1276f 100644
--- a/History.txt
+++ b/History.txt
@@ -1,3 +1,19 @@
+=== 3.6.0 / 2016-07-24
+
+* 12 bug fixes:
+  * Add ability to detect a shutting down server. Fixes #932
+  * Add support for Expect: 100-continue. Fixes #519
+  * Check SSLContext better. Fixes #828
+  * Clarify behavior of '-t <num>'. Fixes #984
+  * Don't default to VERIFY_PEER. Fixes #1028
+  * Don't use ENV['PWD'] on windows. Fixes #1023
+  * Enlarge the scope of catching app exceptions. Fixes #1027
+  * Execute background hooks after daemonizing. Fixes #925
+  * Handle HUP as a stop unless there is IO redirection. Fixes #911
+  * Implement chunked request handling. Fixes #620
+  * Just rescue exception to return a 500. Fixes #1027
+  * Redirect IO in the jruby daemon mode. Fixes #778
+
 === 3.5.2 / 2016-07-20
 
 * 1 bug fix:
diff --git a/lib/puma/const.rb b/lib/puma/const.rb
index 171a1f17..2ae709d2 100644
--- a/lib/puma/const.rb
+++ b/lib/puma/const.rb
@@ -100,8 +100,8 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "3.5.2".freeze
-    CODE_NAME = "Amateur Raccoon Rocketry".freeze
+    PUMA_VERSION = VERSION = "3.6.0".freeze
+    CODE_NAME = "Sleepy Sunday Serenity".freeze
     PUMA_SERVER_STRING = ['puma', PUMA_VERSION, CODE_NAME].join(' ').freeze
     
     FAST_TRACK_KA_TIMEOUT = 0.2