2.3.6 release

jeremy · jeremy · commit 56bb5504dd1f · 2010-05-22T23:53:40.000-07:00
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG
@@ -1,4 +1,4 @@
-*2.3.6 (pending)*
+*2.3.6 (May 23, 2010)*
 
 * Upgrade TMail from 1.2.3 to 1.2.7.  [Mikel Lindsaar]
 
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
@@ -1,4 +1,4 @@
-*2.3.6 (unreleased)*
+*2.3.6 (May 23, 2010)*
 
 * JSON: set Base.include_root_in_json = true to include a root value in the JSON: {"post": {"title": ...}}. Mirrors the Active Record option.  #2584 [Matthew Moore, Joe Martinez, Elad Meidar, Santiago Pastorino]
 
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
@@ -1,4 +1,4 @@
-*2.3.6 (pending)*
+*2.3.6 (May 23, 2010)*
 
 * Add index length support for MySQL. #1852 [Emili Parreno, Pratik Naik]
 
diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG
@@ -1,3 +1,8 @@
+*2.3.6 (May 23, 2010)*
+
+* No changes, just a version bump.
+
+
 *2.3.5 (November 25, 2009)*
 
 * Minor Bug Fixes and deprecation warnings
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
@@ -1,4 +1,4 @@
-*2.3.6 (pending)*
+*2.3.6 (May 23, 2010)*
 
 * 1.9 compat: deprecated last_(month|year) in favor of prev_(month|year). [fxn]
 
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
@@ -1,11 +1,14 @@
-*Edge*
+*2.3.6 (May 23, 2010)*
 
 * Added config/initializers/cookie_verification_secret.rb with an auto-generated secret for using ActionController::Base#cookies.signed [DHH]
 
 * Fixed that the debugger wouldn't go into IRB mode because of left-over ARGVs [DHH]
 
 
-* 1.9 compatibility
+*2.3.5 (November 25, 2009)*
+
+* Ruby 1.9 compatibility
+
 
 *2.3.4 (September 4, 2009)*
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-2.3.6 (pending)`
	`1`	`+2.3.6 (May 23, 2010)`
`2`	`2`
`3`	`3`	`* Upgrade TMail from 1.2.3 to 1.2.7. [Mikel Lindsaar]`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-2.3.6 (unreleased)`
	`1`	`+2.3.6 (May 23, 2010)`
`2`	`2`
`3`	`3`	`* JSON: set Base.include_root_in_json = true to include a root value in the JSON: {"post": {"title": ...}}. Mirrors the Active Record option. #2584 [Matthew Moore, Joe Martinez, Elad Meidar, Santiago Pastorino]`
`4`	`4`