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:25 UTC
[19/33] incubator-trafficcontrol git commit: fix merge issues
fix merge issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/e73c73a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e73c73a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e73c73a5
Branch: refs/heads/psql-rebase
Commit: e73c73a5299044f725a8678fdda8fb96961e2802
Parents: 5599d3a
Author: Dave Neuman <ne...@apache.org>
Authored: Wed Dec 7 10:32:14 2016 -0700
Committer: Dave Neuman <ne...@apache.org>
Committed: Wed Dec 7 10:32:14 2016 -0700
----------------------------------------------------------------------
traffic_ops/client/fixtures/delivery_service.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e73c73a5/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 d48879b..8d600b3 100644
--- a/traffic_ops/client/fixtures/delivery_service.go
+++ b/traffic_ops/client/fixtures/delivery_service.go
@@ -179,7 +179,7 @@ func DeliveryServiceServer() *client.DeliveryServiceServerResponse {
Response: []client.DeliveryServiceServer{dss},
Size: 1,
OrderBy: "foo",
- Limit: 1,
+ Limit: "1",
}
}