This is an automated email from the ASF dual-hosted git repository.

dangogh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git


The following commit(s) were added to refs/heads/master by this push:
     new 7fe7f67  Fix merge conflict for changed func signature
7fe7f67 is described below

commit 7fe7f67465f8453b639aba3d1bec4e4650e42391
Author: Robert Butts <r...@apache.org>
AuthorDate: Tue Jun 12 16:29:45 2018 -0600

    Fix merge conflict for changed func signature
---
 traffic_ops/traffic_ops_golang/cachegroup/queueupdate.go | 2 +-
 traffic_ops/traffic_ops_golang/cdn/queue.go              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/traffic_ops/traffic_ops_golang/cachegroup/queueupdate.go 
b/traffic_ops/traffic_ops_golang/cachegroup/queueupdate.go
index 8256eb4..75cfde4 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 5222fd4..eb2aa45 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

-- 
To stop receiving notification emails like this one, please contact
dang...@apache.org.

Reply via email to