aboutsummaryrefslogtreecommitdiffstats
path: root/railties/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-11 06:15:08 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-11 06:15:08 -0700
commit616ba15f2cb89588ae3b0a55452f4059f2c118b1 (patch)
treecaa57dc4ba1f070cae6e8325a72799af06baaa68 /railties/CHANGELOG.md
parent829566355818cf40f3aafda70e429670483ba9a3 (diff)
parent844ea9c07e0291701215c061985652bfad097a23 (diff)
downloadrails-616ba15f2cb89588ae3b0a55452f4059f2c118b1.tar.gz
rails-616ba15f2cb89588ae3b0a55452f4059f2c118b1.tar.bz2
rails-616ba15f2cb89588ae3b0a55452f4059f2c118b1.zip
Merge pull request #7488 from needfeed/master
Have rails dbconsole pass sslca to the mysql command line client.
Diffstat (limited to 'railties/CHANGELOG.md')
-rw-r--r--railties/CHANGELOG.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index b42ef8e14a..e889f0c23c 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,5 +1,8 @@
## Rails 4.0.0 (unreleased) ##
+* rails dbconsole now can use SSL for MySQL. The database.yml options sslca, sslcert, sslcapath, sslcipher,
+ and sslkey now affect rails dbconsole. *Jim Kingdon and Lars Petrus*
+
* Correctly handle SCRIPT_NAME when generating routes to engine in application
that's mounted at a sub-uri. With this behavior, you *should not* use
default_url_options[:script_name] to set proper application's mount point by