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/752e01e0 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/752e01e0 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/752e01e0 Branch: refs/heads/master Commit: 752e01e0710fa7cfb07d3c8ee2fd9effa3613120 Parents: bd24f12 9335e5c Author: Brian Geffon <[email protected]> Authored: Tue Nov 12 14:26:49 2013 -0800 Committer: Brian Geffon <[email protected]> Committed: Tue Nov 12 14:26:49 2013 -0800 ---------------------------------------------------------------------- CHANGES | 1 + cop/Makefile.am | 2 + iocore/aio/Makefile.am | 7 ++- iocore/cache/Makefile.am | 7 +-- iocore/cluster/Makefile.am | 7 ++- iocore/dns/Makefile.am | 7 ++- iocore/eventsystem/Makefile.am | 35 ++++++++----- iocore/hostdb/Makefile.am | 8 ++- iocore/net/Makefile.am | 30 +++++++---- iocore/utils/Makefile.am | 1 - lib/ts/Makefile.am | 100 +++++++++++++++++++++--------------- lib/tsconfig/Makefile.am | 13 +++-- lib/wccp/Makefile.am | 10 ++-- mgmt/Makefile.am | 1 + mgmt/cli/Makefile.am | 1 - mgmt/preparse/Makefile.am | 1 + proxy/Makefile.am | 2 - proxy/hdrs/Makefile.am | 19 ++++--- proxy/http/Makefile.am | 15 ++++-- proxy/logging/Makefile.am | 4 ++ 20 files changed, 173 insertions(+), 98 deletions(-) ----------------------------------------------------------------------
