zrhoffman opened a new pull request #6241:
URL: https://github.com/apache/trafficcontrol/pull/6241
Backport of #6235 for 6.0.x
Resolved conflict:
```diff
diff --git a/traffic_ops/traffic_ops_golang/routing/routes.go
b/traffic_ops/traffic_ops_golang/routing/routes.go
index 9ae855bbba..d642b21431 100644
--- a/traffic_ops/traffic_ops_golang/routing/routes.go
+++ b/traffic_ops/traffic_ops_golang/routing/routes.go
@@ -216,8 +216,13 @@ func Routes(d ServerData) ([]Route, []RawRoute,
http.Handler, error) {
{api.Version{Major: 4, Minor: 0}, http.MethodPost,
`divisions/?$`, api.CreateHandler(&division.TODivision{}),
auth.PrivLevelOperations, Authenticated, nil, 4537138003},
{api.Version{Major: 4, Minor: 0}, http.MethodDelete,
`divisions/{id}$`, api.DeleteHandler(&division.TODivision{}),
auth.PrivLevelOperations, Authenticated, nil, 43253822373},
+<<<<<<< HEAD
{api.Version{Major: 4, Minor: 0}, http.MethodGet, `logs/?$`,
logs.Get, auth.PrivLevelReadOnly, Authenticated, nil, 4483405503},
{api.Version{Major: 4, Minor: 0}, http.MethodGet,
`logs/newcount/?$`, logs.GetNewCount, auth.PrivLevelReadOnly, Authenticated,
nil, 44058330123},
+=======
+ {api.Version{Major: 4, Minor: 0}, http.MethodGet, `logs/?$`,
logs.Getv40, auth.PrivLevelReadOnly, nil, Authenticated, nil, 4483405503},
+ {api.Version{Major: 4, Minor: 0}, http.MethodGet,
`logs/newcount/?$`, logs.GetNewCount, auth.PrivLevelReadOnly, nil,
Authenticated, nil, 44058330123},
+>>>>>>> 2977937ed1 (Removed default limits values in logs API (#6235))
//Content invalidation jobs
{api.Version{Major: 4, Minor: 0}, http.MethodGet, `jobs/?$`,
api.ReadHandler(&invalidationjobs.InvalidationJob{}), auth.PrivLevelReadOnly,
Authenticated, nil, 49667820413},
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
