From 1aabea698b4518f37263af15818a2c9fc7565521 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 1 Mar 2012 09:20:24 -0800
Subject: [PATCH] bumping to 3.1.4

---
 RAILS_VERSION                                 | 2 +-
 actionmailer/lib/action_mailer/version.rb     | 2 +-
 actionpack/lib/action_pack/version.rb         | 2 +-
 activemodel/lib/active_model/version.rb       | 2 +-
 activerecord/lib/active_record/version.rb     | 2 +-
 activeresource/lib/active_resource/version.rb | 2 +-
 activesupport/lib/active_support/version.rb   | 2 +-
 railties/lib/rails/version.rb                 | 2 +-
 version.rb                                    | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/RAILS_VERSION b/RAILS_VERSION
index b4569b0002ea3..0aec50e6ede78 100644
--- a/RAILS_VERSION
+++ b/RAILS_VERSION
@@ -1 +1 @@
-3.1.4.rc1
+3.1.4
diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb
index d95e1b5caad85..7d3a0d62b8e63 100644
--- a/actionmailer/lib/action_mailer/version.rb
+++ b/actionmailer/lib/action_mailer/version.rb
@@ -3,7 +3,7 @@ module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
     TINY  = 4
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index 95e22cf8eaf2d..9b8f5cba75e46 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -3,7 +3,7 @@ module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
     TINY  = 4
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/activemodel/lib/active_model/version.rb b/activemodel/lib/active_model/version.rb
index 917bdeb952ed4..42d09a31ebfd5 100644
--- a/activemodel/lib/active_model/version.rb
+++ b/activemodel/lib/active_model/version.rb
@@ -3,7 +3,7 @@ module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
     TINY  = 4
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb
index 32628e7b409b4..0397af26f73ae 100644
--- a/activerecord/lib/active_record/version.rb
+++ b/activerecord/lib/active_record/version.rb
@@ -3,7 +3,7 @@ module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
     TINY  = 4
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb
index 7cd7bafa2fab3..be82ede0d3f43 100644
--- a/activeresource/lib/active_resource/version.rb
+++ b/activeresource/lib/active_resource/version.rb
@@ -3,7 +3,7 @@ module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
     TINY  = 4
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb
index e9013442ec1e3..b53d598a71aba 100644
--- a/activesupport/lib/active_support/version.rb
+++ b/activesupport/lib/active_support/version.rb
@@ -3,7 +3,7 @@ module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
     TINY  = 4
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
index 08e3443b5065c..d24590ee5f0ae 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -3,7 +3,7 @@ module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
     TINY  = 4
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/version.rb b/version.rb
index 08e3443b5065c..d24590ee5f0ae 100644
--- a/version.rb
+++ b/version.rb
@@ -3,7 +3,7 @@ module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
     TINY  = 4
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end