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/47a53bec Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/47a53bec Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/47a53bec Branch: refs/heads/master Commit: 47a53bec100da61c0308a78c35d90e9fbac7f7a9 Parents: 8176151 2b35ff4 Author: Brian Geffon <bri...@apache.org> Authored: Tue Mar 11 11:05:16 2014 -0700 Committer: Brian Geffon <bri...@apache.org> Committed: Tue Mar 11 11:05:16 2014 -0700 ---------------------------------------------------------------------- ci/tsqa/test-log-configuration | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) ----------------------------------------------------------------------