This is an automated email from the ASF dual-hosted git repository. ocket8888 pushed a commit to branch 5.0.x in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 8c4617c7202ac00c155cf86f5b1339f340632d86 Author: Robert O Butts <[email protected]> AuthorDate: Tue Nov 17 18:44:29 2020 -0700 Fix merge non-conflict error (#5300) (cherry picked from commit 0d3b849776819ed854bb7fbf759fa4101a47ccf0) --- lib/go-atscfg/ipallowdotconfig.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/go-atscfg/ipallowdotconfig.go b/lib/go-atscfg/ipallowdotconfig.go index f3f59ba..40fc5e2 100644 --- a/lib/go-atscfg/ipallowdotconfig.go +++ b/lib/go-atscfg/ipallowdotconfig.go @@ -270,7 +270,7 @@ func MakeIPAllowDotConfig( // start with a deny for PUSH and PURGE - TODO CDL: parameterize if isMid { // Edges already deny PUSH and PURGE - ipAllowData = append([]IPAllowData{ + ipAllowDat = append([]ipAllowData{ { Src: `0.0.0.0-255.255.255.255`, Action: ActionDeny, @@ -281,7 +281,7 @@ func MakeIPAllowDotConfig( Action: ActionDeny, Method: `PUSH|PURGE`, }, - }, ipAllowData...) + }, ipAllowDat...) } // end with a deny
