Merge branch 'master' into 5.0.x
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3b8c779f Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3b8c779f Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3b8c779f Branch: refs/heads/5.0.x Commit: 3b8c779fd7f1f7dbb270dd045b0b68ad4613be65 Parents: 00ab2c2 2c757ab Author: Bryan Call <[email protected]> Authored: Tue Jun 3 13:22:47 2014 -0700 Committer: Bryan Call <[email protected]> Committed: Tue Jun 3 13:22:47 2014 -0700 ---------------------------------------------------------------------- CHANGES | 2 ++ mgmt/RecordsConfig.cc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
