From cd461c3e64e09cdcb1e379d1c35423c5e2caa592 Mon Sep 17 00:00:00 2001
From: Travis Warlick <warlickt@operissystems.com>
Date: Sat, 13 Aug 2011 21:23:27 -0500
Subject: Support for multiple etags in an If-None-Match header

This is a rebased version of #2520.

Conflicts:

	actionpack/test/dispatch/request_test.rb
---
 actionpack/CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'actionpack/CHANGELOG.md')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 729a1e8198..239e4445d3 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Support multiple etags in If-None-Match header. *Travis Warlick*
+
 *   Allow to configure how unverified request will be handled using `:with`
     option in `protect_from_forgery` method.
 
-- 
cgit v1.2.3