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/6c920343 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/6c920343 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/6c920343 Branch: refs/heads/psql Commit: 6c920343971f898676206280a714701d3385263a Parents: 2449d7b 3eb67cb Author: Jeremy Mitchell <mitchell...@gmail.com> Authored: Thu Oct 13 11:08:23 2016 -0600 Committer: Jeremy Mitchell <mitchell...@gmail.com> Committed: Thu Oct 13 11:08:23 2016 -0600 ---------------------------------------------------------------------- .../experimental/traffic_monitor/index.html | 18 +- traffic_ops/app/lib/TrafficOpsRoutes.pm | 542 +++++++------------ 2 files changed, 197 insertions(+), 363 deletions(-) ----------------------------------------------------------------------
