Release trinidad 1.2.0

rkh · May 24, 2011 · a137c0e · a137c0e
1 parent cb2d890
commit a137c0e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,16 +2,16 @@ PATH
   remote: .
   specs:
     trinidad (1.2.0.dev)
-      jruby-rack (>= 1.0.6)
-      trinidad_jars (>= 1.0.0)
+      jruby-rack (>= 1.0.9)
+      trinidad_jars (>= 1.0.1)
     trinidad_jars (1.0.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.2)
     fakefs (0.3.1)
-    jruby-rack (1.0.8)
+    jruby-rack (1.0.9)
     mocha (0.9.12)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)

diff --git a/History.txt b/History.txt
@@ -1,3 +1,9 @@
+== Trinidad 1.2.0 (2011-05-24)
+
+* Zero downtime hot deploy
+* Autodetect framework and threadsafe environment
+* Upgrade jruby-rack dependency to 1.0.9
+
 == Trinidad 1.1.1 (2011-03-27)
 
 * Remove shared runtime initialization

diff --git a/lib/trinidad.rb b/lib/trinidad.rb
@@ -22,5 +22,5 @@
 require 'trinidad/war_web_app'
 
 module Trinidad
-  VERSION = '1.2.0.dev'
+  VERSION = '1.2.0'
 end
diff --git a/trinidad.gemspec b/trinidad.gemspec
@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'trinidad'
-  s.version           = '1.2.0.dev'
-  s.date              = '2011-05-18'
+  s.version           = '1.2.0'
+  s.date              = '2011-05-24'
   s.rubyforge_project = 'trinidad'
 
   ## Make sure your summary is short. The description may be as long