Fix merge conflict
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/93e7027b Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/93e7027b Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/93e7027b Branch: refs/heads/5.0.x Commit: 93e7027b4a3240f7bc956e353efd0c8b429ccfd3 Parents: d6a7a9c Author: Leif Hedstrom <zw...@apache.org> Authored: Sat Dec 14 14:46:19 2013 -0700 Committer: Leif Hedstrom <zw...@apache.org> Committed: Sat Dec 14 14:46:19 2013 -0700 ---------------------------------------------------------------------- CHANGES | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/93e7027b/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index f9672d9..c6dfb60 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,8 @@ Changes with Apache Traffic Server 5.0.0 compatibility, so all cluster nodes should be upgraded simultaneously. +Changes with Apache Traffic Server 4.2.0 + *) [TS-2251] Simplify LogBuffer reference counting. *) [TS-2190] Remove cache.log from the cachurl plugin. @@ -92,11 +94,7 @@ Changes with Apache Traffic Server 5.0.0 *) [TS-2348] Rename tstop to traffic_top. -<<<<<<< HEAD -Changes with Apache Traffic Server 4.2.0 -======= *) [TS-2384] Fix regression in key-lookup code between 4.0.x and 4.1.x ->>>>>>> master *) [TS-2340] Fix TextLogObject log rolling. Author: bettydramit <b13621367...@gmail.com>
