Merge branch 'master' into to-exp
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/fd51d689 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/fd51d689 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/fd51d689 Branch: refs/heads/psql Commit: fd51d689a64bd2c8a13db2aaf5b61920f808cae6 Parents: 270ffb7 6f81913 Author: Jeremy Mitchell <mitchell...@gmail.com> Authored: Fri Oct 14 09:35:27 2016 -0600 Committer: Jeremy Mitchell <mitchell...@gmail.com> Committed: Fri Oct 14 09:35:27 2016 -0600 ---------------------------------------------------------------------- traffic_ops/app/lib/API/Parameter.pm | 26 +++++++++++++++++++++++++- traffic_ops/app/lib/TrafficOpsRoutes.pm | 4 ++-- 2 files changed, 27 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
