openshift · tnozicka · Jul 26, 2019 · Jul 26, 2019
diff --git a/test/e2e/patch_from_e2e_testfile.go b/test/e2e/patch_from_e2e_testfile.go
@@ -47,13 +47,14 @@ func ViperizeFlags(viperConfig string) {
 
 }
 
-var viperConfig = ""
+// FIXME: this doesn't actually patch anything since the viperConfig is local to e2e_test.go (not current package)
+var conflictingViperConfig = ""
 
 // we appear to set ours via env-var, not flag
 func GetViperConfig() string {
-	return viperConfig
+	return conflictingViperConfig
 }
 
 func SetViperConfig(val string) {
-	viperConfig = val
+	conflictingViperConfig = val
 }
diff --git a/vendor/bitbucket.org/ww/goautoneg/LICENSE b/vendor/bitbucket.org/ww/goautoneg/LICENSE
diff --git a/vendor/bitbucket.org/ww/goautoneg/Makefile b/vendor/bitbucket.org/ww/goautoneg/Makefile
diff --git a/vendor/bitbucket.org/ww/goautoneg/README.txt b/vendor/bitbucket.org/ww/goautoneg/README.txt
diff --git a/vendor/bitbucket.org/ww/goautoneg/autoneg.go b/vendor/bitbucket.org/ww/goautoneg/autoneg.go
diff --git a/vendor/bitbucket.org/ww/goautoneg/autoneg_test.go b/vendor/bitbucket.org/ww/goautoneg/autoneg_test.go
diff --git a/vendor/github.com/RangelReale/osin/.gitignore b/vendor/github.com/RangelReale/osin/.gitignore
diff --git a/vendor/github.com/RangelReale/osin/.travis.yml b/vendor/github.com/RangelReale/osin/.travis.yml
diff --git a/vendor/github.com/RangelReale/osin/CHANGELOG b/vendor/github.com/RangelReale/osin/CHANGELOG
diff --git a/vendor/github.com/RangelReale/osin/LICENSE b/vendor/github.com/RangelReale/osin/LICENSE