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/a97f64ac
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/a97f64ac
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/a97f64ac

Branch: refs/heads/psql
Commit: a97f64acab02dd247a92c4ec1f5b3cd3a70edc7e
Parents: f6486ef 7001bb2
Author: Jeremy Mitchell <mitchell...@gmail.com>
Authored: Mon Oct 17 09:22:43 2016 -0600
Committer: Jeremy Mitchell <mitchell...@gmail.com>
Committed: Mon Oct 17 09:22:43 2016 -0600

----------------------------------------------------------------------
 docs/source/admin/traffic_stats.rst             |  19 +-
 docs/source/development/traffic_stats.rst       |  22 +-
 docs/source/overview/traffic_stats.rst          |  14 +-
 .../experimental/traffic_monitor/cache/cache.go |  12 +-
 .../traffic_monitor/health/cache_health.go      |  16 +-
 .../traffic_monitor/manager/datarequest.go      |  76 ++-
 .../traffic_monitor/manager/healthresult.go     | 112 +++-
 .../traffic_monitor/manager/manager.go          |  32 +-
 .../traffic_monitor/manager/monitorconfig.go    |  36 +-
 .../traffic_monitor/manager/opsconfig.go        |  23 +-
 .../traffic_monitor/manager/peer.go             |   6 +-
 .../traffic_monitor/manager/polledcaches.go     | 127 +++++
 .../traffic_monitor/manager/stathistory.go      |  54 +-
 traffic_ops/app/cpanfile                        |   1 +
 traffic_ops/app/lib/API/Parameter.pm            |  26 +-
 traffic_ops/app/lib/TrafficOpsRoutes.pm         | 543 +++++++------------
 traffic_ops/experimental/ui/app/src/app.js      |   1 +
 .../ui/app/src/assets/js/ng-map_1.17.6.min.js   |  26 +
 .../ui/app/src/common/api/ASNService.js         |  27 +-
 .../ui/app/src/common/api/CDNService.js         |  17 +-
 .../ui/app/src/common/api/CacheGroupService.js  |  17 +-
 .../src/common/api/DeliveryServiceService.js    |  27 +-
 .../ui/app/src/common/api/DivisionService.js    |  17 +-
 .../ui/app/src/common/api/LocationService.js    |  18 +-
 .../ui/app/src/common/api/ParameterService.js   |  17 +-
 .../ui/app/src/common/api/ProfileService.js     |  17 +-
 .../ui/app/src/common/api/RegionService.js      |  12 +-
 .../ui/app/src/common/api/RoleService.js        |  24 +-
 .../ui/app/src/common/api/ServerService.js      |  27 +-
 .../ui/app/src/common/api/StatusService.js      |  25 +-
 .../ui/app/src/common/api/TenantService.js      |  20 +-
 .../ui/app/src/common/api/TypeService.js        |  29 +-
 .../ui/app/src/common/api/UserService.js        |  17 +-
 .../common/modules/form/asn/form.asn.tpl.html   |   3 +-
 .../form/asn/new/FormNewASNController.js        |   9 +-
 .../form/cacheGroup/FormCacheGroupController.js |  15 +-
 .../form/cacheGroup/form.cacheGroup.tpl.html    |  40 +-
 .../new/FormNewCacheGroupController.js          |   9 +-
 .../form/cdn/new/FormNewCDNController.js        |   9 +-
 .../FormDeliveryServiceController.js            |   2 +-
 .../form.deliveryService.tpl.html               |  30 +-
 .../new/FormNewDeliveryServiceController.js     |   9 +-
 .../division/new/FormNewDivisionController.js   |   9 +-
 .../form/location/FormLocationController.js     |   2 +-
 .../location/new/FormNewLocationController.js   |   9 +-
 .../parameter/new/FormNewParameterController.js |   9 +-
 .../profile/new/FormNewProfileController.js     |   9 +-
 .../modules/form/server/FormServerController.js |  43 +-
 .../form/server/new/FormNewServerController.js  |   9 +-
 .../form/status/new/FormNewStatusController.js  |   9 +-
 .../form/type/new/FormNewTypeController.js      |   9 +-
 .../common/modules/form/user/form.user.tpl.html |   5 +-
 .../form/user/new/FormNewUserController.js      |   9 +-
 .../modules/navigation/navigation.tpl.html      |   4 +-
 traffic_ops/experimental/ui/app/src/index.html  |   1 +
 .../src/modules/private/admin/cdns/new/index.js |   5 +-
 .../configure/deliveryServices/new/index.js     |  15 +-
 .../private/configure/servers/new/index.js      |   4 +-
 .../monitor/dashboards/one/_dashboards.one.scss |   5 +
 .../dashboards/one/dashboards.one.tpl.html      |   4 +-
 .../core/secure/CertificatesClient.java         |  15 +
 .../core/secure/CertificatesPoller.java         |  11 +
 .../core/secure/CertificatesPublisher.java      |   9 +-
 .../main/webapp/WEB-INF/applicationContext.xml  |   3 +
 64 files changed, 1046 insertions(+), 735 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a97f64ac/traffic_ops/app/cpanfile
----------------------------------------------------------------------

Reply via email to