From cd6c8fe9422c9136461d21269300c356f83801dc Mon Sep 17 00:00:00 2001
From: Evan Phoenix <evan@fallingsnow.net>
Date: Fri, 13 Sep 2013 10:03:13 -0700
Subject: [PATCH] Bump to 2.6.0

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

diff --git a/History.txt b/History.txt
index cc8c15ad..1fb73b2e 100644
--- a/History.txt
+++ b/History.txt
@@ -1,3 +1,16 @@
+=== 2.6.0 / 2013-09-13
+
+* 2 minor features:
+  * Add support for event hooks
+  ** Add a hook for state transitions
+  * Add phased restart to capistrano recipe.
+
+* 4 bug fixes:
+  * Convince workers to stop by SIGKILL after timeout
+  * Define RSTRING_NOT_MODIFIED for Rubinius performance
+  * Handle BrokenPipe, StandardError and IOError in fat_wrote and break out
+  * Return success status to the invoking environment
+
 === 2.5.1 / 2013-08-13
 
 * 2 bug fixes:
diff --git a/lib/puma/const.rb b/lib/puma/const.rb
index 17cc54f7..6eea5f1d 100644
--- a/lib/puma/const.rb
+++ b/lib/puma/const.rb
@@ -28,8 +28,8 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.5.1".freeze
-    CODE_NAME = "Astronaut Shoelaces"
+    PUMA_VERSION = VERSION = "2.6.0".freeze
+    CODE_NAME = "Pantsuit Party"
 
     FAST_TRACK_KA_TIMEOUT = 0.2