You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/08/21 18:59:49 UTC

git commit: Updated with the merges to v4.0.0

Updated Branches:
  refs/heads/master 4ce2cb288 -> be93cfbee


Updated with the merges to v4.0.0


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/be93cfbe
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/be93cfbe
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/be93cfbe

Branch: refs/heads/master
Commit: be93cfbeefc74f2102d45b00f4fc6137bf79c4e2
Parents: 4ce2cb2
Author: Leif Hedstrom <zw...@apache.org>
Authored: Wed Aug 21 10:59:44 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Wed Aug 21 10:59:44 2013 -0600

----------------------------------------------------------------------
 CHANGES | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/be93cfbe/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index c643c81..4604c67 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,11 +24,6 @@ Changes with Apache Traffic Server 4.1.0
 
   *) [TS-2123] Remove useless max_entries_per_buffer option.
 
-  *) [TS-1823] remap.config line continuation support.
-    Author: Jim Riggs <ji...@riggs.me>
-
-  *) [TS-1597] Document remap.config filters. Author: Jim Riggs <ji...@riggs.me>.
-
 
 Changes with Apache Traffic Server 4.0.0
 
@@ -37,6 +32,12 @@ Changes with Apache Traffic Server 4.0.0
   *) [TS-2127] Move hostdb.config to var/trafficserver, together with with the
    host.db itself.
 
+  *) [TS-1823] remap.config line continuation support
+    Author: Jim Riggs <ji...@riggs.me>
+
+  *) [TS-1597] Document remap.config filters
+    Author: Jim Riggs <ji...@riggs.me>
+
   *) [TS-2132, TS-2131] ${libexecdir} and $(localstatedir} chowned
    needlessly chowned to to ATS' user.
    Author: Tomasz Kuzemko <to...@kuzemko.net>