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/2449d7b0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/2449d7b0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/2449d7b0 Branch: refs/heads/psql Commit: 2449d7b0eae3dea0ae5f942af632ccd7a2c06eef Parents: 223c615 b196b41 Author: Jeremy Mitchell <mitchell...@gmail.com> Authored: Thu Oct 13 10:09:22 2016 -0600 Committer: Jeremy Mitchell <mitchell...@gmail.com> Committed: Thu Oct 13 10:09:22 2016 -0600 ---------------------------------------------------------------------- .../experimental/traffic_monitor/cache/cache.go | 8 +- .../traffic_monitor/deliveryservice/stat.go | 348 +++++++++++-------- .../traffic_monitor/deliveryservicedata/stat.go | 16 +- .../experimental/traffic_monitor/index.html | 66 +--- .../traffic_monitor/manager/datarequest.go | 17 +- .../traffic_monitor/manager/lastkbpsstats.go | 16 +- .../traffic_monitor/manager/opsconfig.go | 4 +- .../traffic_monitor/manager/stathistory.go | 18 +- 8 files changed, 257 insertions(+), 236 deletions(-) ----------------------------------------------------------------------
