You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@trafficserver.apache.org by ki...@apache.org on 2013/12/04 00:38:36 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/2b6a5f6b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2b6a5f6b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2b6a5f6b

Branch: refs/heads/master
Commit: 2b6a5f6bb391109f669b6f51b724da01d09c60a0
Parents: 5dcbbb1 e4a806d
Author: Kit Chan <ki...@apache.org>
Authored: Tue Dec 3 23:36:18 2013 +0000
Committer: Kit Chan <ki...@apache.org>
Committed: Tue Dec 3 23:36:18 2013 +0000

----------------------------------------------------------------------
 doc/admin/faqs.en.rst                             | 2 +-
 doc/reference/configuration/records.config.en.rst | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------