fix minor issues found durint ENT merge (#14250)
This commit is contained in:
parent
0114bcfe5b
commit
7ee3de3ea5
|
@ -744,13 +744,13 @@ func DefaultConfig() *Config {
|
|||
Max: pointer.Of(4 * time.Minute),
|
||||
},
|
||||
ConsulRetry: &RetryConfig{
|
||||
Attempts: pointer.Of[int](0), // unlimited
|
||||
Attempts: pointer.Of(0), // unlimited
|
||||
},
|
||||
VaultRetry: &RetryConfig{
|
||||
Attempts: pointer.Of[int](0), // unlimited
|
||||
Attempts: pointer.Of(0), // unlimited
|
||||
},
|
||||
NomadRetry: &RetryConfig{
|
||||
Attempts: pointer.Of[int](0), // unlimited
|
||||
Attempts: pointer.Of(0), // unlimited
|
||||
},
|
||||
},
|
||||
RPCHoldTimeout: 5 * time.Second,
|
||||
|
|
|
@ -9,7 +9,7 @@ import (
|
|||
|
||||
"github.com/hashicorp/nomad/api"
|
||||
"github.com/hashicorp/nomad/ci"
|
||||
"github.com/hashicorp/nomad/helper"
|
||||
"github.com/hashicorp/nomad/helper/pointer"
|
||||
"github.com/mitchellh/cli"
|
||||
"github.com/posener/complete"
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
|
Loading…
Reference in New Issue