From d0cda0500eb4fa8818323a8680ac38a504aa9c15 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Thu, 14 Jun 2018 11:15:02 -0400
Subject: [PATCH] MM-10769 Rename references to spf13/viper to mattermost/viper
 (#8948)

---
 Gopkg.lock                                                | 2 +-
 Gopkg.toml                                                | 2 +-
 utils/config.go                                           | 2 +-
 vendor/github.com/{spf13 => mattermost}/viper/.gitignore  | 0
 vendor/github.com/{spf13 => mattermost}/viper/.travis.yml | 0
 vendor/github.com/{spf13 => mattermost}/viper/LICENSE     | 0
 vendor/github.com/{spf13 => mattermost}/viper/README.md   | 0
 vendor/github.com/{spf13 => mattermost}/viper/flags.go    | 0
 vendor/github.com/{spf13 => mattermost}/viper/util.go     | 0
 vendor/github.com/{spf13 => mattermost}/viper/viper.go    | 0
 10 files changed, 3 insertions(+), 3 deletions(-)
 rename vendor/github.com/{spf13 => mattermost}/viper/.gitignore (100%)
 rename vendor/github.com/{spf13 => mattermost}/viper/.travis.yml (100%)
 rename vendor/github.com/{spf13 => mattermost}/viper/LICENSE (100%)
 rename vendor/github.com/{spf13 => mattermost}/viper/README.md (100%)
 rename vendor/github.com/{spf13 => mattermost}/viper/flags.go (100%)
 rename vendor/github.com/{spf13 => mattermost}/viper/util.go (100%)
 rename vendor/github.com/{spf13 => mattermost}/viper/viper.go (100%)

diff --git a/Gopkg.lock b/Gopkg.lock
index 93430224f8..932057b7ab 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 dae8c680d9..d4e7192c7c 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 80673cba61..e42c2820be 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
similarity index 100%
rename from vendor/github.com/spf13/viper/.gitignore
rename to vendor/github.com/mattermost/viper/.gitignore
diff --git a/vendor/github.com/spf13/viper/.travis.yml b/vendor/github.com/mattermost/viper/.travis.yml
similarity index 100%
rename from vendor/github.com/spf13/viper/.travis.yml
rename to vendor/github.com/mattermost/viper/.travis.yml
diff --git a/vendor/github.com/spf13/viper/LICENSE b/vendor/github.com/mattermost/viper/LICENSE
similarity index 100%
rename from vendor/github.com/spf13/viper/LICENSE
rename to vendor/github.com/mattermost/viper/LICENSE
diff --git a/vendor/github.com/spf13/viper/README.md b/vendor/github.com/mattermost/viper/README.md
similarity index 100%
rename from vendor/github.com/spf13/viper/README.md
rename to 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
similarity index 100%
rename from vendor/github.com/spf13/viper/flags.go
rename to 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
similarity index 100%
rename from vendor/github.com/spf13/viper/util.go
rename to 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
similarity index 100%
rename from vendor/github.com/spf13/viper/viper.go
rename to vendor/github.com/mattermost/viper/viper.go