Merge pull request #588 from ChrisHines/config-sort

Sort config files as documented.
hashicorp · Dec 15, 2015 · a57cc6f · a57cc6f
2 parents 9e8e766 + 1668a48
commit a57cc6f
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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)