zrhoffman opened a new pull request #6231:
URL: https://github.com/apache/trafficcontrol/pull/6231
Backport of #6024 for 6.0.x
Resolved conflict:
```diff
diff --cc traffic_ops/traffic_ops_golang/config/config.go
index 3041441aec,b7be58ae24..0000000000
--- a/traffic_ops/traffic_ops_golang/config/config.go
+++ b/traffic_ops/traffic_ops_golang/config/config.go
@@@ -58,7 -58,9 +58,13 @@@ type Config struct
InfluxEnabled bool
InfluxDBConfPath string `json:"influxdb_conf_path"`
Version string
++<<<<<<< HEAD
+ UseIMS bool `json:"use_ims"`
++=======
+ UseIMS bool `json:"use_ims"`
+ RoleBasedPermissions bool
`json:"role_based_permissions"`
+ DefaultCertificateInfo *DefaultCertificateInfo
`json:"default_certificate_info"`
++>>>>>>> 7d0472dc25 (Generate a self signed cert on ds creation/update
(#6024))
}
// ConfigHypnotoad carries http setting for hypnotoad (mojolicious) server
```
--
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]
