From 9b780bacb66699e255e51792aa72488de586f596 Mon Sep 17 00:00:00 2001
From: Evan Phoenix <evan@fallingsnow.net>
Date: Mon, 1 Jul 2013 17:51:27 -0700
Subject: [PATCH] Bump to 2.2.0

---
 History.txt       | 11 +++++++++++
 lib/puma/const.rb |  2 +-
 puma.gemspec      |  4 ++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/History.txt b/History.txt
index 7e0e576a..7b0d5cef 100644
--- a/History.txt
+++ b/History.txt
@@ -1,3 +1,14 @@
+=== 2.2.0 / 2013-07-01
+
+* 1 major feature:
+
+  * Add ability to preload rack app
+
+* 2 minor bugfixes:
+
+  * Don't leak info when not in development. Fixes #256
+  * Load the app, then bind the ports
+
 === 2.1.1 / 2013-06-20
 
 * 2 minor bug fixes:
diff --git a/lib/puma/const.rb b/lib/puma/const.rb
index 80cba24e..f14b04e1 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.1.1".freeze
+    PUMA_VERSION = VERSION = "2.2.0".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2
 
diff --git a/puma.gemspec b/puma.gemspec
index 0f1a988f..bbd042c3 100644
--- a/puma.gemspec
+++ b/puma.gemspec
@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "2.1.1"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2013-06-20"
+  s.date = "2013-07-02"
   s.description = "Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications. Puma is intended for use in both development and production environments. In order to get the best throughput, it is highly recommended that you use a  Ruby implementation with real threads like Rubinius or JRuby."
   s.email = ["evan@phx.io"]
   s.executables = ["puma", "pumactl"]