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/98916289 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/98916289 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/98916289 Branch: refs/heads/master Commit: 989162895c710db33e1ab70bfcc53016e61f0ac3 Parents: 8cc7137 b71a24e Author: Sudheer Vinukonda <sudhe...@yahoo-inc.com> Authored: Tue Nov 11 19:17:01 2014 +0000 Committer: Sudheer Vinukonda <sudhe...@yahoo-inc.com> Committed: Tue Nov 11 19:17:01 2014 +0000 ---------------------------------------------------------------------- CHANGES | 2 + iocore/eventsystem/EventSystem.cc | 3 +- iocore/eventsystem/I_ProxyAllocator.h | 35 ++++++++++++----- iocore/eventsystem/ProxyAllocator.cc | 29 ++++++++++---- lib/ts/Allocator.h | 34 ++++++++++++++++ lib/ts/ink_queue.cc | 62 ++++++++++++++++++++++++++++++ lib/ts/ink_queue.h | 1 + 7 files changed, 148 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
