From 393cd591dc8a5abc326d9504f1b6cd41b220397f Mon Sep 17 00:00:00 2001
From: Vladimir Vivien <vladimir.vivien@gmail.com>
Date: Fri, 12 Aug 2016 14:14:35 -0400
Subject: [PATCH] Handle TOML Library Licensing

This patch updates the package used for parsing TOML content from
"github.com/BurntSushi/toml" to "github.com/pelletier/go-toml" as the
latter uses a more accepted OSS license (MIT), enabling the inclusion of
Viper or projects that depend on Viper in projects that have licensing
requirements incongruent with the license of the previous TOML package.
---
 util.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/util.go b/util.go
index 46f923c..fe6cb45 100644
--- a/util.go
+++ b/util.go
@@ -21,9 +21,9 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/BurntSushi/toml"
 	"github.com/hashicorp/hcl"
 	"github.com/magiconair/properties"
+	toml "github.com/pelletier/go-toml"
 	"github.com/spf13/cast"
 	jww "github.com/spf13/jwalterweatherman"
 	"gopkg.in/yaml.v2"
@@ -155,9 +155,14 @@ func unmarshallConfigReader(in io.Reader, c map[string]interface{}, configType s
 		}
 
 	case "toml":
-		if _, err := toml.Decode(buf.String(), &c); err != nil {
+		tree, err := toml.LoadReader(buf)
+		if err != nil {
 			return ConfigParseError{err}
 		}
+		tmap := tree.ToMap()
+		for k, v := range tmap {
+			c[k] = v
+		}
 
 	case "properties", "props", "prop":
 		var p *properties.Properties