Merge pull request #2252 from hashicorp/f-govendor

Switches over to govendor.
hashicorp · Aug 9, 2016 · f46957a · f46957a
2 parents 3a21d4b + 4882d94
commit f46957a
Show file tree

Hide file tree

Showing 4 changed files with 344 additions and 344 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/Readme b/Godeps/Readme
diff --git a/README.md b/README.md
@@ -84,19 +84,5 @@ with MinGW.
 
 ## Vendoring
 
-Consul currently uses [Godep](https://github.com/tools/godep) for vendoring. These
-steps can be used to update dependencies in a controlled way.
-
-Start by running a clean golang container:
-
-```docker run -i -t -v `pwd`:/go/src/github.com/hashicorp/consul golang sh```
-
-After that, you'll get a shell inside the container:
-
-1. Run `go get github.com/tools/godep` to install Godep.
-2. Run `cd /go/src/github.com/hashicorp/consul` to change to the Consul repo. Note
-   that we mounted that as a volume above into the `GOPATH`.
-3. Run `godep restore` to update the container with the current state of dependencies
-   based on what's vendored.
-4. Update dependencies as needed.
-5. Run `godep save` and look at the results carefully before committing.
+Consul currently uses [govendor](https://github.com/kardianos/govendor) for
+vendoring.