Merge branch 'master' of 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/90af89c4 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/90af89c4 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/90af89c4 Branch: refs/heads/master Commit: 90af89c47425cf55ca1a472ec68847afb2efc57a Parents: 9e06528 0c953e1 Author: Miles Libbey <mlib...@apache.org> Authored: Wed Dec 18 17:03:02 2013 -0800 Committer: Miles Libbey <mlib...@apache.org> Committed: Wed Dec 18 17:03:02 2013 -0800 ---------------------------------------------------------------------- CHANGES | 2 +- doc/arch/cache/cache-arch.en.rst | 148 ++++++++++++------- doc/glossary.en.rst | 42 +++++- ...viewing-statistics-using-traffic-line.en.rst | 2 +- lib/atscppapi/src/include/atscppapi/Headers.h | 2 +- 5 files changed, 142 insertions(+), 54 deletions(-) ----------------------------------------------------------------------
