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/0a51ce2f Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0a51ce2f Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0a51ce2f Branch: refs/heads/master Commit: 0a51ce2f65a36249b486e5ad592ba9a9211467d5 Parents: 88c5531 505593d Author: shinrich <[email protected]> Authored: Tue Apr 28 14:24:10 2015 -0500 Committer: shinrich <[email protected]> Committed: Tue Apr 28 14:24:10 2015 -0500 ---------------------------------------------------------------------- CHANGES | 3 +++ plugins/experimental/background_fetch/background_fetch.cc | 2 +- plugins/experimental/cache_promote/cache_promote.cc | 3 +-- 3 files changed, 5 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
