4f05192be3
This changes (*Config).Merge to merge all fields of a Config. Previously, when merging Configs, some configuration fields were ignored and completely lost, including APIAddr, ClusterAddr, and a couple boolean fields. This only occurs when using multiple config files and does not affect single config files (even when loading from a directory -- Merge is only called after a second file is loaded). - Fix APIAddr not being merged. - Fix ClusterAddr not being merged. - Fix DisablePrintableCheck not being merged. - Fix DisableClustering not being merged. The DisableClusteringRaw value is also preserved so that it can be used in overrides for storage fields. - Use merged top-level config as storage field overrides. - Update config dir test fixtures to set some fields missed by (*Config).Merge previously. |
||
|---|---|---|
| .. | ||
| config-dir | ||
| reload | ||
| config.hcl | ||
| config.hcl.json | ||
| config2.hcl | ||
| config2.hcl.json | ||