You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2012/05/16 06:15:26 UTC
[1/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/trafficserver into 934
Updated Branches:
refs/heads/master dcef71e98 -> 9c5bac58a
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver into 934
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9c5bac58
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9c5bac58
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9c5bac58
Branch: refs/heads/master
Commit: 9c5bac58a5b19eb5f037222cb9b80ea2df7e92e3
Parents: acdb96d dcef71e
Author: jplevyak@apache.org <jp...@apache.org>
Authored: Tue May 15 21:12:59 2012 -0700
Committer: John Plevyak <jp...@acm.org>
Committed: Tue May 15 21:12:59 2012 -0700
----------------------------------------------------------------------
cop/TrafficCop.cc | 394 +++++++++------------------
iocore/cache/Cache.cc | 5 +-
iocore/cache/P_CacheInternal.h | 1 +
iocore/cache/RamCacheCLFUS.cc | 10 +-
iocore/cache/RamCacheLRU.cc | 29 ++-
iocore/cache/Store.cc | 2 +-
proxy/config/records.config.default.in | 6 +
rc/trafficserver.conf.in | 2 +-
8 files changed, 170 insertions(+), 279 deletions(-)
----------------------------------------------------------------------