You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2016/11/28 21:23:08 UTC
[10/11] incubator-trafficcontrol git commit: Merge branch
'to-client-psql' of https://github.com/dneuman64/incubator-trafficcontrol
into psql-rebase
Merge branch 'to-client-psql' of https://github.com/dneuman64/incubator-trafficcontrol into psql-rebase
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/dc81269d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/dc81269d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/dc81269d
Branch: refs/heads/psql-rebase
Commit: dc81269d1e808f0bbab25e2d885a1e9a6abd5257
Parents: ec0d162 2d2aac9
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Mon Nov 28 14:20:50 2016 -0700
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Mon Nov 28 14:20:50 2016 -0700
----------------------------------------------------------------------
traffic_ops/app/lib/API/HwInfo.pm | 2 +-
traffic_ops/client/cachegroup.go | 5 ++-
traffic_ops/client/cdn.go | 3 +-
.../client/delivery_service_resources.go | 33 ++++++++++----------
traffic_ops/client/fixtures/cachegroup.go | 4 +--
traffic_ops/client/fixtures/delivery_service.go | 30 +++++++++---------
traffic_ops/client/fixtures/hardware.go | 15 ++++++---
traffic_ops/client/fixtures/server.go | 22 ++++++-------
traffic_ops/client/fixtures/user.go | 2 +-
traffic_ops/client/hardware.go | 10 ++++--
traffic_ops/client/parameter.go | 1 -
traffic_ops/client/profile.go | 1 -
traffic_ops/client/server.go | 7 ++---
traffic_ops/client/stats_summary.go | 1 -
traffic_ops/client/tests/cachegroup_test.go | 12 +++----
.../client/tests/delivery_service_test.go | 8 ++---
traffic_ops/client/tests/hardware_test.go | 27 ++++++++--------
traffic_ops/client/tests/user_test.go | 2 +-
traffic_ops/client/traffic_monitor_config.go | 1 -
traffic_ops/client/traffic_ops.go | 3 +-
traffic_ops/client/traffic_router_config.go | 1 -
traffic_ops/client/type.go | 1 -
traffic_ops/client/user.go | 7 ++---
23 files changed, 99 insertions(+), 99 deletions(-)
----------------------------------------------------------------------