Release trinidad 1.2.2

rkh · Jul 12, 2011 · dd5fce3 · dd5fce3
1 parent 5534dec
commit dd5fce3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trinidad (1.2.0)
+    trinidad (1.2.2)
       jruby-rack (>= 1.0.9)
       trinidad_jars (>= 1.0.1)
     trinidad_jars (1.0.1)

diff --git a/History.txt b/History.txt
@@ -1,3 +1,9 @@
+== Trinidad 1.2.2 (2011-07-12)
+
+* Better log formatter
+* Allow to use an ERB template as configuration file
+* Fix trinidad_init_services compatibility issues
+
 == Trinidad 1.2.1 (2011-06-15)
 
 * Allow to specify the monitor file from the command line

diff --git a/lib/trinidad.rb b/lib/trinidad.rb
@@ -23,5 +23,5 @@
 require 'trinidad/war_web_app'
 
 module Trinidad
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 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.1'
-  s.date              = '2011-06-15'
+  s.version           = '1.2.2'
+  s.date              = '2011-07-12'
   s.rubyforge_project = 'trinidad'
 
   ## Make sure your summary is short. The description may be as long
@@ -67,6 +67,7 @@ lib/trinidad/command_line_parser.rb
 lib/trinidad/core_ext.rb
 lib/trinidad/extensions.rb
 lib/trinidad/lifecycle
+lib/trinidad/log_formatter.rb
 lib/trinidad/rackup_web_app.rb
 lib/trinidad/rails_web_app.rb
 lib/trinidad/server.rb