summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2018-06-14 11:15:02 -0400
committerChristopher Speller <crspeller@gmail.com>2018-06-14 08:15:02 -0700
commitd0cda0500eb4fa8818323a8680ac38a504aa9c15 (patch)
treeb59eaab60a5c3b880afac90936085a9fea45d529
parent337b121bfb948627262f66ad599fc68787017179 (diff)
downloadchat-d0cda0500eb4fa8818323a8680ac38a504aa9c15.tar.gz
chat-d0cda0500eb4fa8818323a8680ac38a504aa9c15.tar.bz2
chat-d0cda0500eb4fa8818323a8680ac38a504aa9c15.zip
MM-10769 Rename references to spf13/viper to mattermost/viper (#8948)
-rw-r--r--Gopkg.lock2
-rw-r--r--Gopkg.toml2
-rw-r--r--utils/config.go2
-rw-r--r--vendor/github.com/mattermost/viper/.gitignore (renamed from vendor/github.com/spf13/viper/.gitignore)0
-rw-r--r--vendor/github.com/mattermost/viper/.travis.yml (renamed from vendor/github.com/spf13/viper/.travis.yml)0
-rw-r--r--vendor/github.com/mattermost/viper/LICENSE (renamed from vendor/github.com/spf13/viper/LICENSE)0
-rw-r--r--vendor/github.com/mattermost/viper/README.md (renamed from vendor/github.com/spf13/viper/README.md)0
-rw-r--r--vendor/github.com/mattermost/viper/flags.go (renamed from vendor/github.com/spf13/viper/flags.go)0
-rw-r--r--vendor/github.com/mattermost/viper/util.go (renamed from vendor/github.com/spf13/viper/util.go)0
-rw-r--r--vendor/github.com/mattermost/viper/viper.go (renamed from vendor/github.com/spf13/viper/viper.go)0
10 files changed, 3 insertions, 3 deletions
diff --git a/Gopkg.lock b/Gopkg.lock
index 93430224f..932057b7a 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -468,7 +468,7 @@
[[projects]]
branch = "env-settings"
- name = "github.com/spf13/viper"
+ name = "github.com/mattermost/viper"
packages = ["."]
revision = "4f5003aa93559718c866d86fbc795439079484f5"
source = "https://github.com/mattermost/viper"
diff --git a/Gopkg.toml b/Gopkg.toml
index dae8c680d..d4e7192c7 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -46,7 +46,7 @@
# Fork for adding our own method to viper EnvSettings
[[constraint]]
- name = "github.com/spf13/viper"
+ name = "github.com/mattermost/viper"
source = "https://github.com/mattermost/viper"
branch = "env-settings"
diff --git a/utils/config.go b/utils/config.go
index 80673cba6..e42c2820b 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -16,8 +16,8 @@ import (
"strings"
"github.com/fsnotify/fsnotify"
+ "github.com/mattermost/viper"
"github.com/pkg/errors"
- "github.com/spf13/viper"
"net/http"
diff --git a/vendor/github.com/spf13/viper/.gitignore b/vendor/github.com/mattermost/viper/.gitignore
index 352a34a56..352a34a56 100644
--- a/vendor/github.com/spf13/viper/.gitignore
+++ b/vendor/github.com/mattermost/viper/.gitignore
diff --git a/vendor/github.com/spf13/viper/.travis.yml b/vendor/github.com/mattermost/viper/.travis.yml
index 55960d11b..55960d11b 100644
--- a/vendor/github.com/spf13/viper/.travis.yml
+++ b/vendor/github.com/mattermost/viper/.travis.yml
diff --git a/vendor/github.com/spf13/viper/LICENSE b/vendor/github.com/mattermost/viper/LICENSE
index 4527efb9c..4527efb9c 100644
--- a/vendor/github.com/spf13/viper/LICENSE
+++ b/vendor/github.com/mattermost/viper/LICENSE
diff --git a/vendor/github.com/spf13/viper/README.md b/vendor/github.com/mattermost/viper/README.md
index 64bf47435..64bf47435 100644
--- a/vendor/github.com/spf13/viper/README.md
+++ b/vendor/github.com/mattermost/viper/README.md
diff --git a/vendor/github.com/spf13/viper/flags.go b/vendor/github.com/mattermost/viper/flags.go
index dd32f4e1c..dd32f4e1c 100644
--- a/vendor/github.com/spf13/viper/flags.go
+++ b/vendor/github.com/mattermost/viper/flags.go
diff --git a/vendor/github.com/spf13/viper/util.go b/vendor/github.com/mattermost/viper/util.go
index 952cad44c..952cad44c 100644
--- a/vendor/github.com/spf13/viper/util.go
+++ b/vendor/github.com/mattermost/viper/util.go
diff --git a/vendor/github.com/spf13/viper/viper.go b/vendor/github.com/mattermost/viper/viper.go
index b9e165695..b9e165695 100644
--- a/vendor/github.com/spf13/viper/viper.go
+++ b/vendor/github.com/mattermost/viper/viper.go