fix merge issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/5599d3a8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/5599d3a8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/5599d3a8 Branch: refs/heads/psql-rebase Commit: 5599d3a82c8b51d817940ba208de360a2b7640eb Parents: 19da637 Author: Dave Neuman <neu...@apache.org> Authored: Wed Dec 7 10:11:02 2016 -0700 Committer: Dave Neuman <neu...@apache.org> Committed: Wed Dec 7 10:11:02 2016 -0700 ---------------------------------------------------------------------- traffic_ops/client/delivery_service_resources.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5599d3a8/traffic_ops/client/delivery_service_resources.go ---------------------------------------------------------------------- diff --git a/traffic_ops/client/delivery_service_resources.go b/traffic_ops/client/delivery_service_resources.go index 26d64d8..be6667e 100644 --- a/traffic_ops/client/delivery_service_resources.go +++ b/traffic_ops/client/delivery_service_resources.go @@ -190,7 +190,7 @@ type DeliveryServiceServerResponse struct { Response []DeliveryServiceServer `json:"response"` Size int `json:"size"` OrderBy string `json:"orderby"` - Limit int `json:"limit"` + Limit string `json:"limit"` } // DeliveryServiceServer ...
