summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2012-03-26 21:35:10 +0000
committerEric Wong <normalperson@yhbt.net>2012-03-26 21:35:10 +0000
commit4757aa70c3b3ab953255f74831b6f98e6f32fb72 (patch)
tree04328c54741e3776e3b12c2f388364105941c3d5
parent84e92a9d301f3f42d1d1e4430db33dfb43d54818 (diff)
* Stale pid files are detected if a pid is recycled by processes
  belonging to another user, thanks to Graham Bleach.
* nginx example config updates thanks to to Eike Herzbach.
* KNOWN_ISSUES now documents issues with apps/libs that install
  conflicting signal handlers.
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--lib/unicorn/const.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index d2e3b5c..6819d39 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v4.2.0.GIT
+DEF_VER=v4.2.1.GIT
 
 LF='
 '
diff --git a/lib/unicorn/const.rb b/lib/unicorn/const.rb
index 2f76856..312e8e8 100644
--- a/lib/unicorn/const.rb
+++ b/lib/unicorn/const.rb
@@ -8,7 +8,7 @@
 # improve things much compared to constants.
 module Unicorn::Const
 
-  UNICORN_VERSION = "4.2.0"
+  UNICORN_VERSION = "4.2.1"
 
   # default TCP listen host address (0.0.0.0, all interfaces)
   DEFAULT_HOST = "0.0.0.0"