Updated Branches:
refs/heads/master a75f807df -> f059a8a73
TS-1143: Fix edge cases in IpMap.
Conflicts:
CHANGES
lib/ts/IpMap.cc
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f059a8a7
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f059a8a7
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f059a8a7
Branch: refs/heads/master
Commit: f059a8a73f1dbc09dca047e848fa86580068595d
Parents: adebcc8 a75f807
Author: Alan M. Carroll <[email protected]>
Authored: Tue Mar 20 17:10:35 2012 -0500
Committer: Alan M. Carroll <[email protected]>
Committed: Tue Mar 20 17:10:35 2012 -0500
----------------------------------------------------------------------
.gitignore | 2 +
CHANGES | 15 +++++-
STATUS | 3 +-
configure.ac | 13 +++-
cop/Makefile.am | 1 +
doc/man/traffic_shell.1 | 16 +++---
iocore/aio/Makefile.am | 3 +-
iocore/cache/CacheWrite.cc | 105 +++++++++++++++++----------------
iocore/cache/Makefile.am | 6 ++-
iocore/cluster/Makefile.am | 3 +
iocore/dns/Makefile.am | 4 +-
iocore/eventsystem/Makefile.am | 3 +-
iocore/hostdb/Makefile.am | 4 +-
iocore/net/Makefile.am | 4 +-
iocore/net/UnixNetVConnection.cc | 4 +-
iocore/utils/Makefile.am | 1 +
lib/records/Makefile.am | 3 +-
lib/ts/Makefile.am | 2 +-
lib/ts/ink_inet.h | 16 +++++-
lib/ts/test_Map.cc | 2 +-
mgmt/Makefile.am | 4 +
mgmt/api/Makefile.am | 1 +
mgmt/api/remote/Makefile.am | 1 +
mgmt/cli/Makefile.am | 1 +
mgmt/cluster/Makefile.am | 1 +
mgmt/preparse/Makefile.am | 1 +
mgmt/stats/Makefile.am | 1 +
mgmt/tools/Makefile.am | 1 +
mgmt/utils/Makefile.am | 1 +
mgmt/web2/Makefile.am | 1 +
plugins/conf_remap/Makefile.am | 3 +-
proxy/Makefile.am | 3 +
proxy/UglyLogStubs.cc | 75 +++++++++++++++++++++++-
proxy/congest/Makefile.am | 1 +
proxy/hdrs/HdrHeap.cc | 2 +
proxy/hdrs/HdrHeap.h | 29 +++++++++-
proxy/hdrs/Makefile.am | 3 +-
proxy/http/Makefile.am | 3 +
proxy/http/remap/Makefile.am | 3 +
proxy/logging/Makefile.am | 3 +
proxy/stats/Makefile.am | 1 +
rc/trafficserver.service.in | 13 ++++
42 files changed, 280 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f059a8a7/CHANGES
----------------------------------------------------------------------
diff --cc CHANGES
index 49f9106,0941af7..d6f954a
--- a/CHANGES
+++ b/CHANGES
@@@ -1,8 -1,19 +1,21 @@@
-*- coding: utf-8 -*-
- Changes with Apache Traffic Server 3.1.3
+ Changes with Apache Traffic Server 3.1.4
+ *) [TS-1143] Fixed edge case problems in IpMap.
+
+ *) [TS-1114] Fix to lock vol for CacheVC::write_vector.
+
+ *) [TS-857] Possibly related race in UnixNetVConnection::mainEvent
+ on inactivity timeout.
+
+ *) [TS-1149] Pretty up automake output.
+
+
+ Changes with Apache Traffic Server 3.1.3
+ *) [TS-1145] Additional clang build fixes. Author: Darrin Jewell.
+
+ *) [TS-1144] Fix out of tree builds. Author: Darrin Jewell.
+
- *) [TS-1138] Fixed off by one range error in IpMap.s
+ *) [TS-1138] Fixed off by one range error in IpMap.
*) [TS-462] Support TLS Server Name Indication (SNI)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f059a8a7/lib/ts/ink_inet.h
----------------------------------------------------------------------
