Sync CHANGELOGs from 3-1-stable

3 files changed, 42 insertions, 0 deletions

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 74711c0320..3e2dbe4e13 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -64,6 +64,15 @@
 
 ## Rails 3.1.2 (unreleased) ##
 
+*   Ensure that the format isn't applied twice to the cache key, else it becomes impossible
+    to target with expire_action.
+
+    *Christopher Meiklejohn*
+
+*   Swallow error when can't unmarshall object from session.
+
+    *Bruno Zanchet*
+
 *   Implement a workaround for a bug in ruby-1.9.3p0 where an error would be raised
     while attempting to convert a template from one encoding to another.
 
@@ -76,6 +85,8 @@
 
     *Jon Leighton*
 
+*   Ensure users upgrading from 3.0.x to 3.1.x will properly upgrade their flash object in session (issues #3298 and #2509)
+
 ## Rails 3.1.1 (unreleased) ##
 
 *   javascript_path and stylesheet_path now refer to /assets if asset pipelining
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index a79f4df570..65578c1dc9 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -67,6 +67,27 @@
 
 ## Rails 3.1.2 (unreleased) ##
 
+*   Fix bug with PostgreSQLAdapter#indexes. When the search path has multiple schemas, spaces
+    were not being stripped from the schema names after the first.
+
+    *Sean Kirby*
+
+*   Preserve SELECT columns on the COUNT for finder_sql when possible. *GH 3503*
+
+    *Justin Mazzi*
+
+*   Reset prepared statement cache when schema changes impact statement results. *GH 3335*
+
+    *Aaron Patterson*
+
+*   Postgres: Do not attempt to deallocate a statement if the connection is no longer active.
+
+    *Ian Leitch*
+
+*   Prevent QueryCache leaking database connections. *GH 3243*
+
+    *Mark J. Titorenko*
+
 *   Fix bug where building the conditions of a nested through association could potentially
     modify the conditions of the through and/or source association. If you have experienced
     bugs with conditions appearing in the wrong queries when using nested through associations,
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 0c59f59917..b05ac21b49 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -30,6 +30,16 @@
     Plugins developers need to special case their initializers that are
     meant to be run in the assets group by adding :group => :assets.
 
+## Rails 3.1.2 (unreleased) ##
+
+*   Engines: don't blow up if db/seeds.rb is missing.
+
+    *Jeremy Kemper*
+
+*   `rails new foo --skip-test-unit` should not add the `:test` task to the rake default task.
+    *GH 2564*
+
+    *José Valim*
 
 ## Rails 3.1.0 (August 30, 2011) ##