Merge branch 'master' into v2-master-merge

altsrc/flag_generated.go

@@ -1,3 +1,5 @@
+// Code generated by fg; DO NOT EDIT.
+
 package altsrc
 
 import (

altsrc/json_source_context.go

@@ -203,6 +203,5 @@ func jsonGetValue(key string, m map[string]interface{}) (interface{}, error) {
 
 type jsonSource struct {
 	file         string
-	deserialized map[string]interface {
-	}
+	deserialized map[string]interface{}
 }

altsrc/toml_command_test.go

@@ -1,8 +1,3 @@
-// Disabling building of toml support in cases where golang is 1.0 or 1.1
-// as the encoding library is not implemented or supported.
-
-// +build go1.2
-
 package altsrc
 
 import (

altsrc/toml_file_loader.go

@@ -1,8 +1,3 @@
-// Disabling building of toml support in cases where golang is 1.0 or 1.1
-// as the encoding library is not implemented or supported.
-
-// +build go1.2
-
 package altsrc
 
 import (

altsrc/yaml_command_test.go

@@ -1,8 +1,3 @@
-// Disabling building of yaml support in cases where golang is 1.0 or 1.1
-// as the encoding library is not implemented or supported.
-
-// +build go1.2
-
 package altsrc
 
 import (

altsrc/yaml_file_loader.go

@@ -1,8 +1,3 @@
-// Disabling building of yaml support in cases where golang is 1.0 or 1.1
-// as the encoding library is not implemented or supported.
-
-// +build go1.2
-
 package altsrc
 
 import (