aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-06-27 22:00:27 +0200
committerYves Senn <yves.senn@gmail.com>2013-06-27 22:00:27 +0200
commit9a8f59340b86151b183d6561a94b953371c3daf3 (patch)
treedc7b6fd562051ff3b5c9b78beb6253578cb8a200
parent0a55bd7c6bdc4c3022cec858e341f7561ec8554b (diff)
downloadrails-9a8f59340b86151b183d6561a94b953371c3daf3.tar.gz
rails-9a8f59340b86151b183d6561a94b953371c3daf3.tar.bz2
rails-9a8f59340b86151b183d6561a94b953371c3daf3.zip
unify duplicate CHANGELOG entry
-rw-r--r--railties/CHANGELOG.md8
1 files changed, 2 insertions, 6 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 43aed3f0e7..4e75cb8375 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -3,8 +3,9 @@
* Fix bugs that crashed `rake test:benchmark`, `rails profiler` and
`rails benchmarker`.
Fixes #4938.
+ Backport rails/rails-perftest#2.
- *Yves Senn*
+ *Dmitry Vorotilin + Yves Senn*
* Add support for runner hook.
@@ -27,11 +28,6 @@
* No changes.
-* Fix launching performance tests through rake `test:benchmark`.
- Fixes #4938.
- Backport rails/rails-perftest#2.
-
- *Dmitry Vorotilin + Yves Senn*
## Rails 3.2.11 (Jan 8, 2013) ##