Repository: trafficserver Updated Branches: refs/heads/master 3e2067e6c -> dc1ad38aa
Move TS-3274 to 5.2.0, backport Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/dc1ad38a Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/dc1ad38a Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/dc1ad38a Branch: refs/heads/master Commit: dc1ad38aab2a08ed5f02101b53074c40beebb243 Parents: 3e2067e Author: Leif Hedstrom <[email protected]> Authored: Thu Jan 8 19:06:34 2015 -0700 Committer: Leif Hedstrom <[email protected]> Committed: Thu Jan 8 19:06:34 2015 -0700 ---------------------------------------------------------------------- CHANGES | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dc1ad38a/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index a13ff76..35a7cbe 100644 --- a/CHANGES +++ b/CHANGES @@ -11,9 +11,6 @@ Changes with Apache Traffic Server 5.3.0 *) [TS-3275] Clear out event_loop when stop'ing an EventIO. This was as the code originally intended, but was somehow lost. - *) [TS-3274] Forward port fix for cache fixup race condition in ram cache - from 4.2.X. - *) [TS-3225] Add more API support to ts_lua plugin. *) [TS-3255] Support flush option in gzip plugin. @@ -56,6 +53,9 @@ Changes with Apache Traffic Server 5.2.0 *) [TS-3276] Fix cache backwards compatibility issue. + *) [TS-3274] Forward port fix for cache fixup race condition in ram cache + from 4.2.X. + *) [TS-2119] Fix builds for mysql remap plugin. *) [TS-3083] Fix core dump due to FetchSM double delete.
