Skip to content

Commit

Permalink
backport of commit a012912
Browse files Browse the repository at this point in the history
  • Loading branch information
tgross committed Jun 9, 2023
1 parent a2ae5fa commit 42fa898
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions nomad/leader.go
Original file line number Diff line number Diff line change
Expand Up @@ -1848,7 +1848,7 @@ func (s *Server) replicateACLRoles(stopCh chan struct{}) {
if !ServersMeetMinimumVersion(
s.serf.Members(), s.Region(), minACLRoleVersion, true) {
s.logger.Trace(
"all servers must be upgraded to 1.4.0 before ACL Roles can be replicated")
"all servers must be upgraded to 1.4.0 or later before ACL Roles can be replicated")
if s.replicationBackoffContinue(stopCh) {
continue
} else {
Expand Down Expand Up @@ -2057,7 +2057,7 @@ func (s *Server) replicateACLAuthMethods(stopCh chan struct{}) {
if !ServersMeetMinimumVersion(
s.serf.Members(), s.Region(), minACLAuthMethodVersion, true) {
s.logger.Trace(
"all servers must be upgraded to 1.5.0 before ACL Auth Methods can be replicated")
"all servers must be upgraded to 1.5.0 or later before ACL Auth Methods can be replicated")
if s.replicationBackoffContinue(stopCh) {
continue
} else {
Expand Down Expand Up @@ -2263,7 +2263,7 @@ func (s *Server) replicateACLBindingRules(stopCh chan struct{}) {
if !ServersMeetMinimumVersion(
s.serf.Members(), s.Region(), minACLBindingRuleVersion, true) {
s.logger.Trace(
"all servers must be upgraded to 1.5.0 before ACL Binding Rules can be replicated")
"all servers must be upgraded to 1.5.0 or later before ACL Binding Rules can be replicated")
if s.replicationBackoffContinue(stopCh) {
continue
} else {
Expand Down

0 comments on commit 42fa898

Please sign in to comment.