From 72e59a538011b00abfd3461e5089d4854a6ef7d5 Mon Sep 17 00:00:00 2001
From: Evan Phoenix <evan@phx.io>
Date: Wed, 11 Feb 2015 15:45:52 -0800
Subject: [PATCH] Bump to 2.11.1

---
 History.txt       | 10 ++++++++++
 lib/puma/const.rb |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/History.txt b/History.txt
index 87a1ed46..1647e848 100644
--- a/History.txt
+++ b/History.txt
@@ -1,3 +1,13 @@
+=== 2.11.1 / 2015-02-11
+
+* 2 bug fixes:
+  * Avoid crash in strange restart conditions
+  * Inject the GEM_HOME that bundler into puma-wild's env. Fixes #653
+
+* 2 PRs merged:
+  * Merge pull request #644 from bpaquet/master
+  * Merge pull request #646 from mkonecny/master
+
 === 2.11.0 / 2015-01-20
 
 * 9 bug fixes:
diff --git a/lib/puma/const.rb b/lib/puma/const.rb
index ff0ba1f5..1cc67fe9 100644
--- a/lib/puma/const.rb
+++ b/lib/puma/const.rb
@@ -28,7 +28,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.11.0".freeze
+    PUMA_VERSION = VERSION = "2.11.1".freeze
     CODE_NAME = "Intrepid Squirrel".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2