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/12/12 20:29:23 UTC
[17/33] incubator-trafficcontrol git commit: fix merge
fix merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/19da6373
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/19da6373
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/19da6373
Branch: refs/heads/psql-rebase
Commit: 19da63731421148ed97f298d917cf8ad165fe529
Parents: e0c6ffb
Author: Dave Neuman <ne...@apache.org>
Authored: Wed Dec 7 10:04:55 2016 -0700
Committer: Dave Neuman <ne...@apache.org>
Committed: Wed Dec 7 10:04:55 2016 -0700
----------------------------------------------------------------------
traffic_ops/client/fixtures/delivery_service.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/19da6373/traffic_ops/client/fixtures/delivery_service.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/fixtures/delivery_service.go b/traffic_ops/client/fixtures/delivery_service.go
index 2408cb6..d48879b 100644
--- a/traffic_ops/client/fixtures/delivery_service.go
+++ b/traffic_ops/client/fixtures/delivery_service.go
@@ -177,9 +177,9 @@ func DeliveryServiceServer() *client.DeliveryServiceServerResponse {
return &client.DeliveryServiceServerResponse{
Response: []client.DeliveryServiceServer{dss},
- Size: "1",
+ Size: 1,
OrderBy: "foo",
- Limit: "1",
+ Limit: 1,
}
}