You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by br...@apache.org on 2014/05/13 18:49:52 UTC

[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver

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/842a06ed
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/842a06ed
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/842a06ed

Branch: refs/heads/master
Commit: 842a06ed8f54d6342e7987acb33b7c960f3db0f4
Parents: bcdd049 5d2c24a
Author: Brian Geffon <br...@apache.org>
Authored: Tue May 13 09:49:44 2014 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Tue May 13 09:49:44 2014 -0700

----------------------------------------------------------------------
 CHANGES                          | 44 ++++++++++++++++++++++-------------
 configure.ac                     |  1 -
 plugins/experimental/Makefile.am |  1 -
 3 files changed, 28 insertions(+), 18 deletions(-)
----------------------------------------------------------------------