merges with master

Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/bbfeb37f
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/bbfeb37f
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/bbfeb37f

Branch: refs/heads/psql
Commit: bbfeb37fabfb9c5232ca471b297f47c5610ba56a
Parents: 7cae72a 3eb67cb
Author: Jeremy Mitchell <mitchell...@gmail.com>
Authored: Thu Oct 13 15:53:24 2016 -0600
Committer: Jeremy Mitchell <mitchell...@gmail.com>
Committed: Thu Oct 13 15:53:24 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     |  86 ++---
 .../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, 268 insertions(+), 245 deletions(-)
----------------------------------------------------------------------


Reply via email to