about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2010-10-27 23:29:55 +0000
committerEric Wong <normalperson@yhbt.net>2010-10-27 23:30:17 +0000
commit7f3ebe9213e09932cd0e8a2a82bfe2dd5430a824 (patch)
tree786ff4e88bbf47e0e3c1bd58106de42d1d3f5263
parent7207a8cbd1f0fbfd8c8543fd21e4f04ecff6e2f5 (diff)
This maintenance release fixes several long-standing but
recently-noticed bugs.  SIGHUP reloading now correctly restores
default values if they're erased or commented-out in the Unicorn
configuration file.  Delays/slowdowns in signal handling since
0.990 are fixed, too.
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--lib/unicorn/const.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 755e132..9e60ee9 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.1.4.GIT
+DEF_VER=v1.1.5.GIT
 
 LF='
 '
diff --git a/lib/unicorn/const.rb b/lib/unicorn/const.rb
index a166780..2f0b106 100644
--- a/lib/unicorn/const.rb
+++ b/lib/unicorn/const.rb
@@ -8,8 +8,8 @@ module Unicorn
   # Symbols did not really improve things much compared to constants.
   module Const
 
-    # The current version of Unicorn, currently 1.1.4
-    UNICORN_VERSION="1.1.4"
+    # The current version of Unicorn, currently 1.1.5
+    UNICORN_VERSION="1.1.5"
 
     DEFAULT_HOST = "0.0.0.0" # default TCP listen host address
     DEFAULT_PORT = 8080      # default TCP listen port