Merge branch 'master' of https://github.com/manjeshnilange/trafficserver
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3adb279f Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3adb279f Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3adb279f Branch: refs/heads/master Commit: 3adb279fe706c16d7310b57ab42a40efa2553696 Parents: 5d38019 5994228 Author: Brian Geffon <[email protected]> Authored: Thu Mar 27 11:31:27 2014 -0700 Committer: Brian Geffon <[email protected]> Committed: Thu Mar 27 11:31:27 2014 -0700 ---------------------------------------------------------------------- .../examples/async_http_fetch/AsyncHttpFetch.cc | 42 +++++++++++++++++- .../examples/async_timer/AsyncTimer.cc | 17 ++++++-- lib/atscppapi/src/AsyncHttpFetch.cc | 4 +- lib/atscppapi/src/AsyncTimer.cc | 12 +++-- lib/atscppapi/src/InterceptPlugin.cc | 6 +++ lib/atscppapi/src/include/atscppapi/Async.h | 46 +++++++++++++++++--- .../src/include/atscppapi/AsyncHttpFetch.h | 2 +- .../src/include/atscppapi/AsyncTimer.h | 4 +- .../src/include/atscppapi/InterceptPlugin.h | 3 ++ 9 files changed, 118 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
