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/00ab2c27 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/00ab2c27 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/00ab2c27 Branch: refs/heads/5.0.x Commit: 00ab2c27e1b91e4c8ac99124a5b22d9ead93e285 Parents: 7d7cf94 fed9e77 Author: Bryan Call <[email protected]> Authored: Tue Jun 3 13:08:24 2014 -0700 Committer: Bryan Call <[email protected]> Committed: Tue Jun 3 13:08:24 2014 -0700 ---------------------------------------------------------------------- CHANGES | 2 ++ mgmt/RecordsConfig.cc | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
