From 1db54d7d01ea36a9d8c0c6276d66d04a9a6c2fac Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Mon, 4 Feb 2013 17:16:25 +0100
Subject: Backport rails/rails-perftest#2 to fix rake test:benchmark

---
 railties/CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 4bb2ec4618..9ecb37e903 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -21,6 +21,11 @@
 
 *   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) ##
 
-- 
cgit v1.2.3