dangogh closed pull request #2403: Fix merge conflict for changed func signature
URL: https://github.com/apache/incubator-trafficcontrol/pull/2403
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/traffic_ops/traffic_ops_golang/cachegroup/queueupdate.go
b/traffic_ops/traffic_ops_golang/cachegroup/queueupdate.go
index 8256eb43f..75cfde4cf 100644
--- a/traffic_ops/traffic_ops_golang/cachegroup/queueupdate.go
+++ b/traffic_ops/traffic_ops_golang/cachegroup/queueupdate.go
@@ -39,7 +39,7 @@ func QueueUpdates(db *sql.DB) http.HandlerFunc {
api.HandleErr(w, r, http.StatusInternalServerError,
nil, errors.New("getting user: "+err.Error()))
return
}
- params, intParams, userErr, sysErr, errCode := api.AllParams(r,
[]string{"id"})
+ params, intParams, userErr, sysErr, errCode := api.AllParams(r,
[]string{"id"}, []string{"id"})
if userErr != nil || sysErr != nil {
api.HandleErr(w, r, errCode, userErr, sysErr)
return
diff --git a/traffic_ops/traffic_ops_golang/cdn/queue.go
b/traffic_ops/traffic_ops_golang/cdn/queue.go
index 5222fd47f..eb2aa45d1 100644
--- a/traffic_ops/traffic_ops_golang/cdn/queue.go
+++ b/traffic_ops/traffic_ops_golang/cdn/queue.go
@@ -45,7 +45,7 @@ func Queue(db *sql.DB) http.HandlerFunc {
api.HandleErr(w, r, http.StatusInternalServerError,
nil, errors.New("getting user: "+err.Error()))
return
}
- params, intParams, userErr, sysErr, errCode := api.AllParams(r,
[]string{"id"})
+ params, intParams, userErr, sysErr, errCode := api.AllParams(r,
[]string{"id"}, []string{"id"})
if userErr != nil || sysErr != nil {
api.HandleErr(w, r, errCode, userErr, sysErr)
return
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
