From c46b3b8b46917b3ba9cd5e18625f7f1eaf414219 Mon Sep 17 00:00:00 2001
From: Chris Wanstrath <chris@ozmm.org>
Date: Thu, 17 Mar 2011 15:48:53 -0700
Subject: [PATCH] 1.14.0

---
 HISTORY.md            | 13 +++++++++++++
 lib/resque/version.rb |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index 9de6c7cd1..c5c73e935 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,16 @@
+## 1.14.0 (2011-03-17)
+
+* Sleep interval can now be a float
+* Added Resque.inline to allow in-process performing of jobs (for testing)
+* Fixed tests for Ruby 1.9.2
+* Added Resque.validate(klass) to validate a Job
+* Decode errors are no longer ignored to help debugging
+* Web: Sinatra 1.2 compatibility
+* Fixed after_enqueue hook to actually run in `Resque.enqueue`
+* Fixed very_verbose timestamps to use 24 hour time (AM/PM wasn't included)
+* Fixed monit example
+* Fixed Worker#pid
+
 ## 1.13.0 (2011-02-07)
 
 * Depend on redis-namespace >= 0.10
diff --git a/lib/resque/version.rb b/lib/resque/version.rb
index b1d2ceb0d..55fb95dc4 100644
--- a/lib/resque/version.rb
+++ b/lib/resque/version.rb
@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '1.13.0'
+  Version = VERSION = '1.14.0'
 end