From 1668a4804e79061dee3420c5e0cdbb3d1b30e0ed Mon Sep 17 00:00:00 2001 From: Chris Hines Date: Tue, 15 Dec 2015 02:05:25 -0500 Subject: [PATCH] Sort config files as documented. --- command/agent/config.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/command/agent/config.go b/command/agent/config.go index 8ee166842f96..52bd0911bab4 100644 --- a/command/agent/config.go +++ b/command/agent/config.go @@ -8,6 +8,7 @@ import ( "os" "path/filepath" "runtime" + "sort" "strings" "time" @@ -705,6 +706,8 @@ func LoadConfigDir(dir string) (*Config, error) { return &Config{}, nil } + sort.Strings(files) + var result *Config for _, f := range files { config, err := LoadConfigFile(f)