Permalink
Browse files

Merge branch 'release/v1.20.2' into develop

  • Loading branch information...
2 parents 8902ce0 + e9c7ac1 commit 52c8027192246b10053458b062f2500871e2590f @ramontayag committed May 26, 2012
Showing with 5 additions and 1 deletion.
  1. +4 −0 HISTORY.md
  2. +1 −1 lib/resque/version.rb
View
@@ -1,3 +1,7 @@
+## 1.20.2 (2012-05-26)
+
+* Removes loading of Resque::Launcher in lib/resque.rb - it was causing errors, and the launcher is only needed in the rake file
+
## 1.20.1 (2012-05-26)
* Merge in changes by yaauie to create PIDFILE before Rails initialization (https://github.com/ramontayag/resque/commit/cd068717da70c307e685ebd1c8445ae2ee2a4f2c)
View
@@ -1,3 +1,3 @@
module Resque
- Version = VERSION = '1.20.1'
+ Version = VERSION = '1.20.2'
end

0 comments on commit 52c8027

Please sign in to comment.