Backport: Update go-ucfg to version 0.4.5 (elastic#3318)

urso · Jan 13, 2017 · feb20ac · feb20ac
1 parent c140992
commit feb20ac
Show file tree

Hide file tree

Showing 12 changed files with 74 additions and 44 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -28,6 +28,7 @@ https://github.com/elastic/beats/compare/v5.1.1...master[Check the HEAD diff]
 ==== Bugfixes
 
 *Affecting all Beats*
+- Fix overwriting explicit empty config sections {issue}2918[2918]
 
 *Metricbeat*
 

diff --git a/glide.yaml b/glide.yaml
@@ -83,7 +83,7 @@ import:
 - package: github.com/dustin/go-humanize
   version: 499693e27ee0d14ffab67c31ad065fdb3d34ea75
 - package: github.com/elastic/go-ucfg
-  version: v0.4.3
+  version: v0.4.5
 - package: github.com/armon/go-socks5
   version: 3a873e99f5400ad7706e464e905ffcc94b3ff247
 - package: github.com/pkg/errors

diff --git a/vendor/github.com/elastic/go-ucfg/CHANGELOG.md b/vendor/github.com/elastic/go-ucfg/CHANGELOG.md
diff --git a/vendor/github.com/elastic/go-ucfg/error.go b/vendor/github.com/elastic/go-ucfg/error.go
diff --git a/vendor/github.com/elastic/go-ucfg/flag/util.go b/vendor/github.com/elastic/go-ucfg/flag/util.go
diff --git a/vendor/github.com/elastic/go-ucfg/json/json.go b/vendor/github.com/elastic/go-ucfg/json/json.go
diff --git a/vendor/github.com/elastic/go-ucfg/merge.go b/vendor/github.com/elastic/go-ucfg/merge.go
diff --git a/vendor/github.com/elastic/go-ucfg/reify.go b/vendor/github.com/elastic/go-ucfg/reify.go
diff --git a/vendor/github.com/elastic/go-ucfg/testdata/error/message/invalid_type_top_level.golden b/vendor/github.com/elastic/go-ucfg/testdata/error/message/invalid_type_top_level.golden
diff --git a/...or/github.com/elastic/go-ucfg/testdata/error/message/invalid_type_top_level_w_meta.golden b/...or/github.com/elastic/go-ucfg/testdata/error/message/invalid_type_top_level_w_meta.golden
diff --git a/...r/github.com/elastic/go-ucfg/testdata/error/message/invalid_type_top_level_wo_meta.golden b/...r/github.com/elastic/go-ucfg/testdata/error/message/invalid_type_top_level_wo_meta.golden
diff --git a/vendor/github.com/elastic/go-ucfg/yaml/yaml.go b/vendor/github.com/elastic/go-ucfg/yaml/yaml.go