Merge current v2.8 into master
This commit is contained in:
commit
ab94bbaece
71 changed files with 1093 additions and 475 deletions
|
@ -46,7 +46,7 @@ type itemData struct {
|
|||
|
||||
// ProviderBuilder is responsible for constructing namespaced instances of the Consul Catalog provider.
|
||||
type ProviderBuilder struct {
|
||||
Configuration `export:"true"`
|
||||
Configuration `yaml:",inline" export:"true"`
|
||||
|
||||
// Deprecated: use Namespaces option instead.
|
||||
Namespace string `description:"Sets the namespace used to discover services (Consul Enterprise only)." json:"namespace,omitempty" toml:"namespace,omitempty" yaml:"namespace,omitempty"`
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue