Merge https://git-wip-us.apache.org/repos/asf/trafficserver
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/41f1c2e1 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/41f1c2e1 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/41f1c2e1 Branch: refs/heads/master Commit: 41f1c2e143501f060fb8b9b43d40d6ca194c7147 Parents: 5654cf4 e2aff41 Author: niq <n...@apache.org> Authored: Mon Apr 15 16:32:25 2013 +0100 Committer: niq <n...@apache.org> Committed: Mon Apr 15 16:32:25 2013 +0100 ---------------------------------------------------------------------- CHANGES | 11 + Vagrantfile | 2 +- contrib/manifests/debian.pp | 2 +- .../perl/AdminClient/lib/Apache/TS/AdminClient.pm | 1 - example/app-template/app-template.cc | 6 +- iocore/cache/Cache.cc | 12 + iocore/cache/CacheWrite.cc | 20 ++- iocore/cache/P_CacheInternal.h | 3 + iocore/cache/P_CacheVol.h | 2 +- mgmt/Main.cc | 3 - mgmt/RecordsConfig.cc | 6 +- mgmt/api/CfgContextUtils.cc | 70 ++---- mgmt/api/CfgContextUtils.h | 2 +- mgmt/api/CoreAPI.cc | 7 +- mgmt/api/include/mgmtapi.h | 2 +- mgmt/stats/StatProcessor.cc | 3 +- mgmt/stats/StatType.cc | 84 +++++-- mgmt/stats/StatType.h | 6 +- proxy/Main.cc | 6 +- proxy/Makefile.am | 3 - proxy/Plugin.cc | 64 +---- proxy/Plugin.h | 2 +- proxy/PluginDB.cc | 205 --------------- proxy/PluginDB.h | 65 ----- proxy/config/Makefile.am | 1 - proxy/config/mgr.cnf.default | 9 - proxy/config/records.config.default.in | 3 + 27 files changed, 154 insertions(+), 446 deletions(-) ----------------------------------------------------------------------
