Fixed changes from merge.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/c1e0681b Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/c1e0681b Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/c1e0681b Branch: refs/heads/4.0.x Commit: c1e0681b2ace0f57066c166e776b883f55f76f35 Parents: 8975eec Author: Leif Hedstrom <zw...@apache.org> Authored: Wed Aug 21 10:52:25 2013 -0600 Committer: Leif Hedstrom <zw...@apache.org> Committed: Wed Aug 21 10:52:25 2013 -0600 ---------------------------------------------------------------------- CHANGES | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c1e0681b/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 84bffe3..afec95a 100644 --- a/CHANGES +++ b/CHANGES @@ -28,9 +28,6 @@ Changes with Apache Traffic Server 4.0.0 v1.33, which is what RHEL5 ships with. - *) [TS-1597] Document remap.config filters - Author: Jim Riggs <j...@riggs.me> - Changes with Apache Traffic Server 3.3.5