[trafficcontrol] branch master updated: Fix TO client merge error, duplicate func (#3672)

[mi...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new ee7329c  Fix TO client merge error, duplicate func (#3672)
ee7329c is described below

commit ee7329c21cd43033b237eb2d1ae4aad543c0ad5b
Author: Robert Butts <ro...@users.noreply.github.com>
AuthorDate: Mon Jun 10 10:03:03 2019 -0600

    Fix TO client merge error, duplicate func (#3672)
    
    Fixes #3671
---
 traffic_ops/client/atsconfig.go | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/traffic_ops/client/atsconfig.go b/traffic_ops/client/atsconfig.go
index a22d297..6432c23 100644
--- a/traffic_ops/client/atsconfig.go
+++ b/traffic_ops/client/atsconfig.go
@@ -86,18 +86,3 @@ func (to *Session) getConfigFile(uri string) (string, ReqInf, error) {
 	bts, err := ioutil.ReadAll(resp.Body)
 	return string(bts), reqInf, err
 }
-
-func (to *Session) GetATSServerConfigList(serverID int) (tc.ATSConfigMetaData, ReqInf, error) {
-	resp, remoteAddr, err := to.request(http.MethodGet, apiBase+"/servers/"+strconv.Itoa(serverID)+"/configfiles/ats", nil)
-	reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
-	if err != nil {
-		return tc.ATSConfigMetaData{}, reqInf, err
-	}
-	defer resp.Body.Close()
-
-	data := tc.ATSConfigMetaData{}
-	if err := json.NewDecoder(resp.Body).Decode(&data); err != nil {
-		return tc.ATSConfigMetaData{}, reqInf, err
-	}
-	return data, reqInf, nil
-}