diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index b6e977b4..26df30c5 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "github.com/google/cadvisor", - "GoVersion": "go1.5", + "GoVersion": "go1.6", "GodepVersion": "v74", "Packages": [ "./..." diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore deleted file mode 100644 index f037d684..00000000 --- a/Godeps/_workspace/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/pkg -/bin diff --git a/Makefile b/Makefile index 1e02f25c..996cf3e4 100644 --- a/Makefile +++ b/Makefile @@ -11,10 +11,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and -GO := godep go -pkgs = $(shell $(GO) list ./...) +GO := go +pkgs = $(shell $(GO) list ./... | grep -v vendor) -all: format build test +all: presubmit build test test: @echo ">> running tests" @@ -43,4 +43,10 @@ release: docker: @docker build -t cadvisor:$(shell git rev-parse --short HEAD) -f deploy/Dockerfile . -.PHONY: all build docker format release test test-integration vet +presubmit: vet + @echo ">> checking go formatting" + @./build/check_gofmt.sh . + @echo ">> checking file boilerplate" + @./build/check_boilerplate.sh + +.PHONY: all build docker format release test test-integration vet presubmit diff --git a/build/boilerplate/boilerplate.py b/build/boilerplate/boilerplate.py index c5c16e7b..bd7e5f6a 100755 --- a/build/boilerplate/boilerplate.py +++ b/build/boilerplate/boilerplate.py @@ -95,7 +95,7 @@ def file_passes(filename, refs, regexs): def file_extension(filename): return os.path.splitext(filename)[1].split(".")[-1].lower() -skipped_dirs = ['Godeps', 'third_party', '_gopath', '_output', '.git'] +skipped_dirs = ['Godeps', 'vendor', 'third_party', '_gopath', '_output', '.git'] def normalize_files(files): newfiles = [] for pathname in files: diff --git a/build/build.sh b/build/build.sh index 46c6f1e3..3775c382 100755 --- a/build/build.sh +++ b/build/build.sh @@ -68,6 +68,6 @@ if [ "$RELEASE" == "true" ]; then echo "Building release candidate with -ldflags $ldflags" fi -GOBIN=$PWD godep go "$GO_CMD" ${GO_FLAGS} -ldflags "${ldflags}" "${repo_path}" +GOBIN=$PWD go "$GO_CMD" ${GO_FLAGS} -ldflags "${ldflags}" "${repo_path}" exit 0 diff --git a/build/check_errorf.sh b/build/check_errorf.sh index f9259c95..3645cef0 100755 --- a/build/check_errorf.sh +++ b/build/check_errorf.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -GO_FILES=$(find . -not -wholename "*Godeps*" -name "*.go") +GO_FILES=$(find . -not -wholename "*Godeps*" -not -wholename "*vendor*" -name "*.go") for FILE in ${GO_FILES}; do ERRS=`grep 'fmt.Errorf("[A-Z]' ${FILE}` diff --git a/build/check_gofmt.sh b/build/check_gofmt.sh index b742c398..65049074 100755 --- a/build/check_gofmt.sh +++ b/build/check_gofmt.sh @@ -21,7 +21,7 @@ if [ $# -ne 1 ]; then fi # Check formatting on non Godep'd code. -GOFMT_PATHS=$(find . -not -wholename "*.git*" -not -wholename "*Godeps*" -not -name "." -type d) +GOFMT_PATHS=$(find . -not -wholename "*.git*" -not -wholename "*Godeps*" -not -wholename "*vendor*" -not -name "." -type d) # Find any files with gofmt problems BAD_FILES=$(gofmt -s -l $GOFMT_PATHS) diff --git a/build/integration.sh b/build/integration.sh index da45c4c0..e5450191 100755 --- a/build/integration.sh +++ b/build/integration.sh @@ -57,4 +57,4 @@ while [ "$(curl -Gs http://localhost:8080/healthz)" != "ok" ]; do done echo ">> running integration tests against local cAdvisor" -godep go test github.com/google/cadvisor/integration/tests/... --vmodule=*=2 +go test github.com/google/cadvisor/integration/tests/... --vmodule=*=2 diff --git a/build/jenkins_e2e.sh b/build/jenkins_e2e.sh index 22c87754..54339d57 100755 --- a/build/jenkins_e2e.sh +++ b/build/jenkins_e2e.sh @@ -22,9 +22,8 @@ BUILDER=${BUILDER:-false} # Whether this is running a PR builder job. export GO_FLAGS="-race" export GORACE="halt_on_error=1" -go get -u github.com/tools/godep -./build/presubmit.sh -godep go build -tags test github.com/google/cadvisor/integration/runner +make +go build -tags test github.com/google/cadvisor/integration/runner # Nodes that are currently stable. When tests fail on a specific node, and the failure is not remedied within a week, that node will be removed from this list. golden_nodes=( diff --git a/build/presubmit.sh b/build/presubmit.sh deleted file mode 100755 index d3b5eb25..00000000 --- a/build/presubmit.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Copyright 2015 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -e -set -x - -./build/check_gofmt.sh . -./build/check_boilerplate.sh -go vet github.com/google/cadvisor/... -godep go test -v -race -test.short github.com/google/cadvisor/... -godep go build github.com/google/cadvisor diff --git a/deploy/build.sh b/deploy/build.sh index ef0a6f40..4869ee09 100755 --- a/deploy/build.sh +++ b/deploy/build.sh @@ -17,6 +17,6 @@ set -e set -x -godep go build -a github.com/google/cadvisor +make build docker build -t google/cadvisor:beta . diff --git a/deploy/canary/Dockerfile b/deploy/canary/Dockerfile index af054ae1..2381aba1 100644 --- a/deploy/canary/Dockerfile +++ b/deploy/canary/Dockerfile @@ -3,8 +3,7 @@ MAINTAINER vmarmol@google.com RUN apt-get install -y git dmsetup RUN git clone https://github.com/google/cadvisor.git /go/src/github.com/google/cadvisor -RUN go get github.com/tools/godep -RUN cd /go/src/github.com/google/cadvisor && godep go build . +RUN cd /go/src/github.com/google/cadvisor && make ENTRYPOINT ["/go/src/github.com/google/cadvisor/cadvisor"] diff --git a/docs/development/build.md b/docs/development/build.md index ab5dd498..c56b614f 100644 --- a/docs/development/build.md +++ b/docs/development/build.md @@ -4,9 +4,9 @@ ## Installing Dependencies -cAdvisor is written in the [Go](http://golang.org) programming language. If you haven't set up a Go development environment, please follow [these instructions](http://golang.org/doc/code.html) to install go tool and set up GOPATH. Ensure that your version of Go is at least 1.3. Note that the version of Go in package repositories of some operating systems is outdated, so please [download](https://golang.org/dl/) the latest version. +cAdvisor is written in the [Go](http://golang.org) programming language. If you haven't set up a Go development environment, please follow [these instructions](http://golang.org/doc/code.html) to install go tool and set up GOPATH. Note that the version of Go in package repositories of some operating systems is outdated, so please [download](https://golang.org/dl/) the latest version. -**Note**: cAdvisor requires Go 1.5 to build. +**Note**: cAdvisor requires Go 1.6 to build. After setting up Go, you should be able to `go get` cAdvisor as expected (we use `-d` to only download): @@ -14,24 +14,18 @@ After setting up Go, you should be able to `go get` cAdvisor as expected (we use $ go get -d github.com/google/cadvisor ``` -We use `godep` so you will need to get that as well: - -``` -$ go get github.com/tools/godep -``` - ## Building from Source At this point you can build cAdvisor from the source folder: ``` -$GOPATH/src/github.com/google/cadvisor $ godep go build . +$GOPATH/src/github.com/google/cadvisor $ make build ``` or run only unit tests: ``` -$GOPATH/src/github.com/google/cadvisor $ godep go test ./... -test.short +$GOPATH/src/github.com/google/cadvisor $ make test ``` For integration tests, see the [integration testing](integration_testing.md) page. @@ -44,12 +38,3 @@ Now you can run the built binary: $GOPATH/src/github.com/google/cadvisor $ sudo ./cadvisor ``` -## Compiling Assets - -If you modify files in the /assets folder, you will need to rebuild the assets: - -``` -$GOPATH/src/github.com/google/cadvisor $ ./build/assets.sh -$GOPATH/src/github.com/google/cadvisor $ godep go build . -``` - diff --git a/docs/development/integration_testing.md b/docs/development/integration_testing.md index e34fed92..4c42a010 100644 --- a/docs/development/integration_testing.md +++ b/docs/development/integration_testing.md @@ -3,7 +3,7 @@ The cAdvisor integration tests can be found in `integration/tests`. These run queries on a running cAdvisor. To run these tests: ``` -$ godep go run integration/runner/runner.go -port=PORT +$ go run integration/runner/runner.go -port=PORT ``` This will build a cAdvisor from the current repository and start it on the target machine before running the tests. @@ -11,7 +11,7 @@ This will build a cAdvisor from the current repository and start it on the targe To simply run the tests against an existing cAdvisor: ``` -$ godep go test github.com/google/cadvisor/integration/tests/... -host=HOST -port=PORT +$ go test github.com/google/cadvisor/integration/tests/... -host=HOST -port=PORT ``` Note that `HOST` and `PORT` default to `localhost` and `8080` respectively. diff --git a/integration/runner/run.sh b/integration/runner/run.sh index 9c6a17e5..eae451fd 100755 --- a/integration/runner/run.sh +++ b/integration/runner/run.sh @@ -30,7 +30,7 @@ if ! git diff --name-only origin/master | grep -c -E "*.go|*.sh" &> /dev/null; t fi # Build the runner. -godep go build github.com/google/cadvisor/integration/runner +go build github.com/google/cadvisor/integration/runner # Run it. HOSTS=$@ diff --git a/integration/runner/runner.go b/integration/runner/runner.go index 160df45d..bd57cbbe 100644 --- a/integration/runner/runner.go +++ b/integration/runner/runner.go @@ -37,7 +37,7 @@ import ( ) // must be able to ssh into hosts without password -// godep go run ./integration/runner/runner.go --logtostderr --v 2 --ssh-config <.ssh/config file> +// go run ./integration/runner/runner.go --logtostderr --v 2 --ssh-config <.ssh/config file> const ( cadvisorBinary = "cadvisor" @@ -180,7 +180,7 @@ func PushAndRunTests(host, testDir string) (result error) { } // Run the command - err = RunCommand("godep", "go", "test", "--timeout", testTimeout.String(), "github.com/google/cadvisor/integration/tests/...", "--host", host, "--port", portStr, "--ssh-options", *sshOptions) + err = RunCommand("go", "test", "--timeout", testTimeout.String(), "github.com/google/cadvisor/integration/tests/...", "--host", host, "--port", portStr, "--ssh-options", *sshOptions) if err == nil { // On success, break out of retry loop break diff --git a/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/Makefile b/vendor/bitbucket.org/ww/goautoneg/Makefile similarity index 100% rename from Godeps/_workspace/src/bitbucket.org/ww/goautoneg/Makefile rename to vendor/bitbucket.org/ww/goautoneg/Makefile diff --git a/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/README.txt b/vendor/bitbucket.org/ww/goautoneg/README.txt similarity index 100% rename from Godeps/_workspace/src/bitbucket.org/ww/goautoneg/README.txt rename to vendor/bitbucket.org/ww/goautoneg/README.txt diff --git a/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/autoneg.go b/vendor/bitbucket.org/ww/goautoneg/autoneg.go similarity index 100% rename from Godeps/_workspace/src/bitbucket.org/ww/goautoneg/autoneg.go rename to vendor/bitbucket.org/ww/goautoneg/autoneg.go diff --git a/Godeps/_workspace/src/github.com/Microsoft/go-winio/.gitignore b/vendor/github.com/Microsoft/go-winio/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/Microsoft/go-winio/.gitignore rename to vendor/github.com/Microsoft/go-winio/.gitignore diff --git a/Godeps/_workspace/src/github.com/Microsoft/go-winio/LICENSE b/vendor/github.com/Microsoft/go-winio/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/Microsoft/go-winio/LICENSE rename to vendor/github.com/Microsoft/go-winio/LICENSE diff --git a/Godeps/_workspace/src/github.com/Microsoft/go-winio/README.md b/vendor/github.com/Microsoft/go-winio/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/Microsoft/go-winio/README.md rename to vendor/github.com/Microsoft/go-winio/README.md diff --git a/Godeps/_workspace/src/github.com/Microsoft/go-winio/backup.go b/vendor/github.com/Microsoft/go-winio/backup.go similarity index 100% rename from Godeps/_workspace/src/github.com/Microsoft/go-winio/backup.go rename to vendor/github.com/Microsoft/go-winio/backup.go diff --git a/Godeps/_workspace/src/github.com/Microsoft/go-winio/file.go b/vendor/github.com/Microsoft/go-winio/file.go similarity index 100% rename from Godeps/_workspace/src/github.com/Microsoft/go-winio/file.go rename to vendor/github.com/Microsoft/go-winio/file.go diff --git a/Godeps/_workspace/src/github.com/Microsoft/go-winio/fileinfo.go b/vendor/github.com/Microsoft/go-winio/fileinfo.go similarity index 100% rename from Godeps/_workspace/src/github.com/Microsoft/go-winio/fileinfo.go rename to vendor/github.com/Microsoft/go-winio/fileinfo.go diff --git a/Godeps/_workspace/src/github.com/Microsoft/go-winio/pipe.go b/vendor/github.com/Microsoft/go-winio/pipe.go similarity index 100% rename from Godeps/_workspace/src/github.com/Microsoft/go-winio/pipe.go rename to vendor/github.com/Microsoft/go-winio/pipe.go diff --git a/Godeps/_workspace/src/github.com/Microsoft/go-winio/privilege.go b/vendor/github.com/Microsoft/go-winio/privilege.go similarity index 100% rename from Godeps/_workspace/src/github.com/Microsoft/go-winio/privilege.go rename to vendor/github.com/Microsoft/go-winio/privilege.go diff --git a/Godeps/_workspace/src/github.com/Microsoft/go-winio/reparse.go b/vendor/github.com/Microsoft/go-winio/reparse.go similarity index 100% rename from Godeps/_workspace/src/github.com/Microsoft/go-winio/reparse.go rename to vendor/github.com/Microsoft/go-winio/reparse.go diff --git a/Godeps/_workspace/src/github.com/Microsoft/go-winio/sd.go b/vendor/github.com/Microsoft/go-winio/sd.go similarity index 100% rename from Godeps/_workspace/src/github.com/Microsoft/go-winio/sd.go rename to vendor/github.com/Microsoft/go-winio/sd.go diff --git a/Godeps/_workspace/src/github.com/Microsoft/go-winio/syscall.go b/vendor/github.com/Microsoft/go-winio/syscall.go similarity index 100% rename from Godeps/_workspace/src/github.com/Microsoft/go-winio/syscall.go rename to vendor/github.com/Microsoft/go-winio/syscall.go diff --git a/Godeps/_workspace/src/github.com/Microsoft/go-winio/zsyscall.go b/vendor/github.com/Microsoft/go-winio/zsyscall.go similarity index 100% rename from Godeps/_workspace/src/github.com/Microsoft/go-winio/zsyscall.go rename to vendor/github.com/Microsoft/go-winio/zsyscall.go diff --git a/Godeps/_workspace/src/github.com/SeanDolphin/bqschema/.gitignore b/vendor/github.com/SeanDolphin/bqschema/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/SeanDolphin/bqschema/.gitignore rename to vendor/github.com/SeanDolphin/bqschema/.gitignore diff --git a/Godeps/_workspace/src/github.com/SeanDolphin/bqschema/.travis.yml b/vendor/github.com/SeanDolphin/bqschema/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/SeanDolphin/bqschema/.travis.yml rename to vendor/github.com/SeanDolphin/bqschema/.travis.yml diff --git a/Godeps/_workspace/src/github.com/SeanDolphin/bqschema/LICENSE b/vendor/github.com/SeanDolphin/bqschema/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/SeanDolphin/bqschema/LICENSE rename to vendor/github.com/SeanDolphin/bqschema/LICENSE diff --git a/Godeps/_workspace/src/github.com/SeanDolphin/bqschema/README.md b/vendor/github.com/SeanDolphin/bqschema/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/SeanDolphin/bqschema/README.md rename to vendor/github.com/SeanDolphin/bqschema/README.md diff --git a/Godeps/_workspace/src/github.com/SeanDolphin/bqschema/toSchema.go b/vendor/github.com/SeanDolphin/bqschema/toSchema.go similarity index 100% rename from Godeps/_workspace/src/github.com/SeanDolphin/bqschema/toSchema.go rename to vendor/github.com/SeanDolphin/bqschema/toSchema.go diff --git a/Godeps/_workspace/src/github.com/SeanDolphin/bqschema/toStructs.go b/vendor/github.com/SeanDolphin/bqschema/toStructs.go similarity index 100% rename from Godeps/_workspace/src/github.com/SeanDolphin/bqschema/toStructs.go rename to vendor/github.com/SeanDolphin/bqschema/toStructs.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/.gitignore b/vendor/github.com/Shopify/sarama/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/.gitignore rename to vendor/github.com/Shopify/sarama/.gitignore diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/.travis.yml b/vendor/github.com/Shopify/sarama/.travis.yml similarity index 94% rename from Godeps/_workspace/src/github.com/Shopify/sarama/.travis.yml rename to vendor/github.com/Shopify/sarama/.travis.yml index 776514b1..10e8dbd1 100644 --- a/Godeps/_workspace/src/github.com/Shopify/sarama/.travis.yml +++ b/vendor/github.com/Shopify/sarama/.travis.yml @@ -1,7 +1,7 @@ language: go go: - 1.4.3 -- 1.5.2 +- 1.5.3 env: global: @@ -11,7 +11,6 @@ env: - KAFKA_HOSTNAME=localhost - DEBUG=true matrix: - - KAFKA_VERSION=0.8.1.1 - KAFKA_VERSION=0.8.2.2 - KAFKA_VERSION=0.9.0.0 diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/CHANGELOG.md b/vendor/github.com/Shopify/sarama/CHANGELOG.md similarity index 93% rename from Godeps/_workspace/src/github.com/Shopify/sarama/CHANGELOG.md rename to vendor/github.com/Shopify/sarama/CHANGELOG.md index fd96b847..ec657719 100644 --- a/Godeps/_workspace/src/github.com/Shopify/sarama/CHANGELOG.md +++ b/vendor/github.com/Shopify/sarama/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +#### Version 1.8.0 (2016-02-01) + +New Features: + - Full support for Kafka 0.9: + - All protocol messages and fields + ([#586](https://github.com/Shopify/sarama/pull/586), + [#588](https://github.com/Shopify/sarama/pull/588), + [#590](https://github.com/Shopify/sarama/pull/590)). + - Verified that TLS support works + ([#581](https://github.com/Shopify/sarama/pull/581)). + - Fixed the OffsetManager compatibility + ([#585](https://github.com/Shopify/sarama/pull/585)). + +Improvements: + - Optimize for fewer system calls when reading from the network + ([#584](https://github.com/Shopify/sarama/pull/584)). + - Automatically retry `InvalidMessage` errors to match upstream behaviour + ([#589](https://github.com/Shopify/sarama/pull/589)). + #### Version 1.7.0 (2015-12-11) New Features: diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/CONTRIBUTING.md b/vendor/github.com/Shopify/sarama/CONTRIBUTING.md similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/CONTRIBUTING.md rename to vendor/github.com/Shopify/sarama/CONTRIBUTING.md diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/MIT-LICENSE b/vendor/github.com/Shopify/sarama/MIT-LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/MIT-LICENSE rename to vendor/github.com/Shopify/sarama/MIT-LICENSE diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/Makefile b/vendor/github.com/Shopify/sarama/Makefile similarity index 68% rename from Godeps/_workspace/src/github.com/Shopify/sarama/Makefile rename to vendor/github.com/Shopify/sarama/Makefile index b76e97a9..01c6d359 100644 --- a/Godeps/_workspace/src/github.com/Shopify/sarama/Makefile +++ b/vendor/github.com/Shopify/sarama/Makefile @@ -7,7 +7,7 @@ vet: go vet ./... errcheck: - errcheck github.com/Shopify/sarama/... + @if go version | grep -q go1.5; then errcheck github.com/Shopify/sarama/...; fi fmt: @if [ -n "$$(go fmt ./...)" ]; then echo 'Please run go fmt on your code.' && exit 1; fi @@ -15,7 +15,7 @@ fmt: install_dependencies: install_errcheck install_go_vet get install_errcheck: - go get github.com/kisielk/errcheck + @if go version | grep -q go1.5; then go get github.com/kisielk/errcheck; fi install_go_vet: go get golang.org/x/tools/cmd/vet diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/README.md b/vendor/github.com/Shopify/sarama/README.md similarity index 96% rename from Godeps/_workspace/src/github.com/Shopify/sarama/README.md rename to vendor/github.com/Shopify/sarama/README.md index 63247b37..26582f95 100644 --- a/Godeps/_workspace/src/github.com/Shopify/sarama/README.md +++ b/vendor/github.com/Shopify/sarama/README.md @@ -18,7 +18,7 @@ Sarama is an MIT-licensed Go client library for [Apache Kafka](https://kafka.apa Sarama provides a "2 releases + 2 months" compatibility guarantee: we support the two latest stable releases of Kafka and Go, and we provide a two month grace period for older releases. This means we currently officially support -Go 1.4 and 1.5, and Kafka 0.8.1 and 0.8.2, although older releases are still +Go 1.5 and 1.4, and Kafka 0.9.0 and 0.8.2, although older releases are still likely to work. Sarama follows semantic versioning and provides API stability via the gopkg.in service. diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/Vagrantfile b/vendor/github.com/Shopify/sarama/Vagrantfile similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/Vagrantfile rename to vendor/github.com/Shopify/sarama/Vagrantfile diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/async_producer.go b/vendor/github.com/Shopify/sarama/async_producer.go similarity index 99% rename from Godeps/_workspace/src/github.com/Shopify/sarama/async_producer.go rename to vendor/github.com/Shopify/sarama/async_producer.go index 44c0abfe..e7ae8c2e 100644 --- a/Godeps/_workspace/src/github.com/Shopify/sarama/async_producer.go +++ b/vendor/github.com/Shopify/sarama/async_producer.go @@ -581,7 +581,8 @@ func (bp *brokerProducer) run() { select { case msg := <-bp.input: if msg == nil { - goto shutdown + bp.shutdown() + return } if msg.flags&syn == syn { @@ -637,8 +638,9 @@ func (bp *brokerProducer) run() { output = nil } } +} -shutdown: +func (bp *brokerProducer) shutdown() { for !bp.buffer.empty() { select { case response := <-bp.responses: @@ -725,7 +727,7 @@ func (bp *brokerProducer) handleSuccess(sent *produceSet, response *ProduceRespo } bp.parent.returnSuccesses(msgs) // Retriable errors - case ErrUnknownTopicOrPartition, ErrNotLeaderForPartition, ErrLeaderNotAvailable, + case ErrInvalidMessage, ErrUnknownTopicOrPartition, ErrLeaderNotAvailable, ErrNotLeaderForPartition, ErrRequestTimedOut, ErrNotEnoughReplicas, ErrNotEnoughReplicasAfterAppend: Logger.Printf("producer/broker/%d state change to [retrying] on %s/%d because %v\n", bp.broker.ID(), topic, partition, block.Err) diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/broker.go b/vendor/github.com/Shopify/sarama/broker.go similarity index 85% rename from Godeps/_workspace/src/github.com/Shopify/sarama/broker.go rename to vendor/github.com/Shopify/sarama/broker.go index 46f06a0f..5523fd4e 100644 --- a/Godeps/_workspace/src/github.com/Shopify/sarama/broker.go +++ b/vendor/github.com/Shopify/sarama/broker.go @@ -85,6 +85,7 @@ func (b *Broker) Open(conf *Config) error { Logger.Printf("Failed to connect to broker %s: %s\n", b.addr, b.connErr) return } + b.conn = newBufConn(b.conn) b.conf = conf b.done = make(chan bool) @@ -239,6 +240,72 @@ func (b *Broker) FetchOffset(request *OffsetFetchRequest) (*OffsetFetchResponse, return response, nil } +func (b *Broker) JoinGroup(request *JoinGroupRequest) (*JoinGroupResponse, error) { + response := new(JoinGroupResponse) + + err := b.sendAndReceive(request, response) + if err != nil { + return nil, err + } + + return response, nil +} + +func (b *Broker) SyncGroup(request *SyncGroupRequest) (*SyncGroupResponse, error) { + response := new(SyncGroupResponse) + + err := b.sendAndReceive(request, response) + if err != nil { + return nil, err + } + + return response, nil +} + +func (b *Broker) LeaveGroup(request *LeaveGroupRequest) (*LeaveGroupResponse, error) { + response := new(LeaveGroupResponse) + + err := b.sendAndReceive(request, response) + if err != nil { + return nil, err + } + + return response, nil +} + +func (b *Broker) Heartbeat(request *HeartbeatRequest) (*HeartbeatResponse, error) { + response := new(HeartbeatResponse) + + err := b.sendAndReceive(request, response) + if err != nil { + return nil, err + } + + return response, nil +} + +func (b *Broker) ListGroups(request *ListGroupsRequest) (*ListGroupsResponse, error) { + response := new(ListGroupsResponse) + + err := b.sendAndReceive(request, response) + if err != nil { + return nil, err + } + + return response, nil +} + +func (b *Broker) DescribeGroups(request *DescribeGroupsRequest) (*DescribeGroupsResponse, error) { + response := new(DescribeGroupsResponse) + + err := b.sendAndReceive(request, response) + if err != nil { + return nil, err + } + + return response, nil +} + func (b *Broker) send(rb requestBody, promiseResponse bool) (*responsePromise, error) { b.lock.Lock() defer b.lock.Unlock() diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/client.go b/vendor/github.com/Shopify/sarama/client.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/client.go rename to vendor/github.com/Shopify/sarama/client.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/config.go b/vendor/github.com/Shopify/sarama/config.go similarity index 98% rename from Godeps/_workspace/src/github.com/Shopify/sarama/config.go rename to vendor/github.com/Shopify/sarama/config.go index 542c6117..7cc91e76 100644 --- a/Godeps/_workspace/src/github.com/Shopify/sarama/config.go +++ b/vendor/github.com/Shopify/sarama/config.go @@ -21,8 +21,6 @@ type Config struct { ReadTimeout time.Duration // How long to wait for a response. WriteTimeout time.Duration // How long to wait for a transmit. - // NOTE: these config values have no compatibility guarantees; they may - // change when Kafka releases its official TLS support in version 0.9. TLS struct { // Whether or not to use TLS when connecting to the broker // (defaults to false). diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/consumer.go b/vendor/github.com/Shopify/sarama/consumer.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/consumer.go rename to vendor/github.com/Shopify/sarama/consumer.go diff --git a/vendor/github.com/Shopify/sarama/consumer_group_members.go b/vendor/github.com/Shopify/sarama/consumer_group_members.go new file mode 100644 index 00000000..9d92d350 --- /dev/null +++ b/vendor/github.com/Shopify/sarama/consumer_group_members.go @@ -0,0 +1,94 @@ +package sarama + +type ConsumerGroupMemberMetadata struct { + Version int16 + Topics []string + UserData []byte +} + +func (m *ConsumerGroupMemberMetadata) encode(pe packetEncoder) error { + pe.putInt16(m.Version) + + if err := pe.putStringArray(m.Topics); err != nil { + return err + } + + if err := pe.putBytes(m.UserData); err != nil { + return err + } + + return nil +} + +func (m *ConsumerGroupMemberMetadata) decode(pd packetDecoder) (err error) { + if m.Version, err = pd.getInt16(); err != nil { + return + } + + if m.Topics, err = pd.getStringArray(); err != nil { + return + } + + if m.UserData, err = pd.getBytes(); err != nil { + return + } + + return nil +} + +type ConsumerGroupMemberAssignment struct { + Version int16 + Topics map[string][]int32 + UserData []byte +} + +func (m *ConsumerGroupMemberAssignment) encode(pe packetEncoder) error { + pe.putInt16(m.Version) + + if err := pe.putArrayLength(len(m.Topics)); err != nil { + return err + } + + for topic, partitions := range m.Topics { + if err := pe.putString(topic); err != nil { + return err + } + if err := pe.putInt32Array(partitions); err != nil { + return err + } + } + + if err := pe.putBytes(m.UserData); err != nil { + return err + } + + return nil +} + +func (m *ConsumerGroupMemberAssignment) decode(pd packetDecoder) (err error) { + if m.Version, err = pd.getInt16(); err != nil { + return + } + + var topicLen int + if topicLen, err = pd.getArrayLength(); err != nil { + return + } + + m.Topics = make(map[string][]int32, topicLen) + for i := 0; i < topicLen; i++ { + var topic string + if topic, err = pd.getString(); err != nil { + return + } + if m.Topics[topic], err = pd.getInt32Array(); err != nil { + return + } + } + + if m.UserData, err = pd.getBytes(); err != nil { + return + } + + return nil +} diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/consumer_metadata_request.go b/vendor/github.com/Shopify/sarama/consumer_metadata_request.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/consumer_metadata_request.go rename to vendor/github.com/Shopify/sarama/consumer_metadata_request.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/consumer_metadata_response.go b/vendor/github.com/Shopify/sarama/consumer_metadata_response.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/consumer_metadata_response.go rename to vendor/github.com/Shopify/sarama/consumer_metadata_response.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/crc32_field.go b/vendor/github.com/Shopify/sarama/crc32_field.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/crc32_field.go rename to vendor/github.com/Shopify/sarama/crc32_field.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/describe_groups_request.go b/vendor/github.com/Shopify/sarama/describe_groups_request.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/describe_groups_request.go rename to vendor/github.com/Shopify/sarama/describe_groups_request.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/describe_groups_response.go b/vendor/github.com/Shopify/sarama/describe_groups_response.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/describe_groups_response.go rename to vendor/github.com/Shopify/sarama/describe_groups_response.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/encoder_decoder.go b/vendor/github.com/Shopify/sarama/encoder_decoder.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/encoder_decoder.go rename to vendor/github.com/Shopify/sarama/encoder_decoder.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/errors.go b/vendor/github.com/Shopify/sarama/errors.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/errors.go rename to vendor/github.com/Shopify/sarama/errors.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/fetch_request.go b/vendor/github.com/Shopify/sarama/fetch_request.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/fetch_request.go rename to vendor/github.com/Shopify/sarama/fetch_request.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/fetch_response.go b/vendor/github.com/Shopify/sarama/fetch_response.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/fetch_response.go rename to vendor/github.com/Shopify/sarama/fetch_response.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/heartbeat_request.go b/vendor/github.com/Shopify/sarama/heartbeat_request.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/heartbeat_request.go rename to vendor/github.com/Shopify/sarama/heartbeat_request.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/heartbeat_response.go b/vendor/github.com/Shopify/sarama/heartbeat_response.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/heartbeat_response.go rename to vendor/github.com/Shopify/sarama/heartbeat_response.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/join_group_request.go b/vendor/github.com/Shopify/sarama/join_group_request.go similarity index 88% rename from Godeps/_workspace/src/github.com/Shopify/sarama/join_group_request.go rename to vendor/github.com/Shopify/sarama/join_group_request.go index 8bb5ce82..5884d79d 100644 --- a/Godeps/_workspace/src/github.com/Shopify/sarama/join_group_request.go +++ b/vendor/github.com/Shopify/sarama/join_group_request.go @@ -92,3 +92,13 @@ func (r *JoinGroupRequest) AddGroupProtocol(name string, metadata []byte) { r.GroupProtocols[name] = metadata } + +func (r *JoinGroupRequest) AddGroupProtocolMetadata(name string, metadata *ConsumerGroupMemberMetadata) error { + bin, err := encode(metadata) + if err != nil { + return err + } + + r.AddGroupProtocol(name, bin) + return nil +} diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/join_group_response.go b/vendor/github.com/Shopify/sarama/join_group_response.go similarity index 81% rename from Godeps/_workspace/src/github.com/Shopify/sarama/join_group_response.go rename to vendor/github.com/Shopify/sarama/join_group_response.go index 037a9cd2..16f6b9b4 100644 --- a/Godeps/_workspace/src/github.com/Shopify/sarama/join_group_response.go +++ b/vendor/github.com/Shopify/sarama/join_group_response.go @@ -9,6 +9,18 @@ type JoinGroupResponse struct { Members map[string][]byte } +func (r *JoinGroupResponse) GetMembers() (map[string]ConsumerGroupMemberMetadata, error) { + members := make(map[string]ConsumerGroupMemberMetadata, len(r.Members)) + for id, bin := range r.Members { + meta := new(ConsumerGroupMemberMetadata) + if err := decode(bin, meta); err != nil { + return nil, err + } + members[id] = *meta + } + return members, nil +} + func (r *JoinGroupResponse) encode(pe packetEncoder) error { pe.putInt16(int16(r.Err)) pe.putInt32(r.GenerationId) diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/leave_group_request.go b/vendor/github.com/Shopify/sarama/leave_group_request.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/leave_group_request.go rename to vendor/github.com/Shopify/sarama/leave_group_request.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/leave_group_response.go b/vendor/github.com/Shopify/sarama/leave_group_response.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/leave_group_response.go rename to vendor/github.com/Shopify/sarama/leave_group_response.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/length_field.go b/vendor/github.com/Shopify/sarama/length_field.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/length_field.go rename to vendor/github.com/Shopify/sarama/length_field.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/list_groups_request.go b/vendor/github.com/Shopify/sarama/list_groups_request.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/list_groups_request.go rename to vendor/github.com/Shopify/sarama/list_groups_request.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/list_groups_response.go b/vendor/github.com/Shopify/sarama/list_groups_response.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/list_groups_response.go rename to vendor/github.com/Shopify/sarama/list_groups_response.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/message.go b/vendor/github.com/Shopify/sarama/message.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/message.go rename to vendor/github.com/Shopify/sarama/message.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/message_set.go b/vendor/github.com/Shopify/sarama/message_set.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/message_set.go rename to vendor/github.com/Shopify/sarama/message_set.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/metadata_request.go b/vendor/github.com/Shopify/sarama/metadata_request.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/metadata_request.go rename to vendor/github.com/Shopify/sarama/metadata_request.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/metadata_response.go b/vendor/github.com/Shopify/sarama/metadata_response.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/metadata_response.go rename to vendor/github.com/Shopify/sarama/metadata_response.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_commit_request.go b/vendor/github.com/Shopify/sarama/offset_commit_request.go similarity index 94% rename from Godeps/_workspace/src/github.com/Shopify/sarama/offset_commit_request.go rename to vendor/github.com/Shopify/sarama/offset_commit_request.go index ba4ac76a..f5181526 100644 --- a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_commit_request.go +++ b/vendor/github.com/Shopify/sarama/offset_commit_request.go @@ -5,6 +5,11 @@ package sarama // The timestamp is only used if message version 1 is used, which requires kafka 0.8.2. const ReceiveTime int64 = -1 +// GroupGenerationUndefined is a special value for the group generation field of +// Offset Commit Requests that should be used when a consumer group does not rely +// on Kafka for partition management. +const GroupGenerationUndefined = -1 + type offsetCommitRequestBlock struct { offset int64 timestamp int64 diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_commit_response.go b/vendor/github.com/Shopify/sarama/offset_commit_response.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/offset_commit_response.go rename to vendor/github.com/Shopify/sarama/offset_commit_response.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_fetch_request.go b/vendor/github.com/Shopify/sarama/offset_fetch_request.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/offset_fetch_request.go rename to vendor/github.com/Shopify/sarama/offset_fetch_request.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_fetch_response.go b/vendor/github.com/Shopify/sarama/offset_fetch_response.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/offset_fetch_response.go rename to vendor/github.com/Shopify/sarama/offset_fetch_response.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_manager.go b/vendor/github.com/Shopify/sarama/offset_manager.go similarity index 99% rename from Godeps/_workspace/src/github.com/Shopify/sarama/offset_manager.go rename to vendor/github.com/Shopify/sarama/offset_manager.go index 880d495f..0c90f7c2 100644 --- a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_manager.go +++ b/vendor/github.com/Shopify/sarama/offset_manager.go @@ -476,8 +476,9 @@ func (bom *brokerOffsetManager) flushToBroker() { func (bom *brokerOffsetManager) constructRequest() *OffsetCommitRequest { r := &OffsetCommitRequest{ - Version: 1, - ConsumerGroup: bom.parent.group, + Version: 1, + ConsumerGroup: bom.parent.group, + ConsumerGroupGeneration: GroupGenerationUndefined, } for s := range bom.subscriptions { diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_request.go b/vendor/github.com/Shopify/sarama/offset_request.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/offset_request.go rename to vendor/github.com/Shopify/sarama/offset_request.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_response.go b/vendor/github.com/Shopify/sarama/offset_response.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/offset_response.go rename to vendor/github.com/Shopify/sarama/offset_response.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/packet_decoder.go b/vendor/github.com/Shopify/sarama/packet_decoder.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/packet_decoder.go rename to vendor/github.com/Shopify/sarama/packet_decoder.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/packet_encoder.go b/vendor/github.com/Shopify/sarama/packet_encoder.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/packet_encoder.go rename to vendor/github.com/Shopify/sarama/packet_encoder.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/partitioner.go b/vendor/github.com/Shopify/sarama/partitioner.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/partitioner.go rename to vendor/github.com/Shopify/sarama/partitioner.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/prep_encoder.go b/vendor/github.com/Shopify/sarama/prep_encoder.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/prep_encoder.go rename to vendor/github.com/Shopify/sarama/prep_encoder.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/produce_request.go b/vendor/github.com/Shopify/sarama/produce_request.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/produce_request.go rename to vendor/github.com/Shopify/sarama/produce_request.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/produce_response.go b/vendor/github.com/Shopify/sarama/produce_response.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/produce_response.go rename to vendor/github.com/Shopify/sarama/produce_response.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/produce_set.go b/vendor/github.com/Shopify/sarama/produce_set.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/produce_set.go rename to vendor/github.com/Shopify/sarama/produce_set.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/real_decoder.go b/vendor/github.com/Shopify/sarama/real_decoder.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/real_decoder.go rename to vendor/github.com/Shopify/sarama/real_decoder.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/real_encoder.go b/vendor/github.com/Shopify/sarama/real_encoder.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/real_encoder.go rename to vendor/github.com/Shopify/sarama/real_encoder.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/request.go b/vendor/github.com/Shopify/sarama/request.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/request.go rename to vendor/github.com/Shopify/sarama/request.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/response_header.go b/vendor/github.com/Shopify/sarama/response_header.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/response_header.go rename to vendor/github.com/Shopify/sarama/response_header.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/sarama.go b/vendor/github.com/Shopify/sarama/sarama.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/sarama.go rename to vendor/github.com/Shopify/sarama/sarama.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/snappy.go b/vendor/github.com/Shopify/sarama/snappy.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/snappy.go rename to vendor/github.com/Shopify/sarama/snappy.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/sync_group_request.go b/vendor/github.com/Shopify/sarama/sync_group_request.go similarity index 86% rename from Godeps/_workspace/src/github.com/Shopify/sarama/sync_group_request.go rename to vendor/github.com/Shopify/sarama/sync_group_request.go index 60be6f3f..031cf0f2 100644 --- a/Godeps/_workspace/src/github.com/Shopify/sarama/sync_group_request.go +++ b/vendor/github.com/Shopify/sarama/sync_group_request.go @@ -84,3 +84,13 @@ func (r *SyncGroupRequest) AddGroupAssignment(memberId string, memberAssignment r.GroupAssignments[memberId] = memberAssignment } + +func (r *SyncGroupRequest) AddGroupAssignmentMember(memberId string, memberAssignment *ConsumerGroupMemberAssignment) error { + bin, err := encode(memberAssignment) + if err != nil { + return err + } + + r.AddGroupAssignment(memberId, bin) + return nil +} diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/sync_group_response.go b/vendor/github.com/Shopify/sarama/sync_group_response.go similarity index 67% rename from Godeps/_workspace/src/github.com/Shopify/sarama/sync_group_response.go rename to vendor/github.com/Shopify/sarama/sync_group_response.go index e10685ef..49c86922 100644 --- a/Godeps/_workspace/src/github.com/Shopify/sarama/sync_group_response.go +++ b/vendor/github.com/Shopify/sarama/sync_group_response.go @@ -5,6 +5,12 @@ type SyncGroupResponse struct { MemberAssignment []byte } +func (r *SyncGroupResponse) GetMemberAssignment() (*ConsumerGroupMemberAssignment, error) { + assignment := new(ConsumerGroupMemberAssignment) + err := decode(r.MemberAssignment, assignment) + return assignment, err +} + func (r *SyncGroupResponse) encode(pe packetEncoder) error { pe.putInt16(int16(r.Err)) return pe.putBytes(r.MemberAssignment) diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/sync_producer.go b/vendor/github.com/Shopify/sarama/sync_producer.go similarity index 100% rename from Godeps/_workspace/src/github.com/Shopify/sarama/sync_producer.go rename to vendor/github.com/Shopify/sarama/sync_producer.go diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/utils.go b/vendor/github.com/Shopify/sarama/utils.go similarity index 83% rename from Godeps/_workspace/src/github.com/Shopify/sarama/utils.go rename to vendor/github.com/Shopify/sarama/utils.go index fef7c738..04ca8875 100644 --- a/Godeps/_workspace/src/github.com/Shopify/sarama/utils.go +++ b/vendor/github.com/Shopify/sarama/utils.go @@ -1,6 +1,10 @@ package sarama -import "sort" +import ( + "bufio" + "net" + "sort" +) type none struct{} @@ -87,3 +91,21 @@ func (b ByteEncoder) Encode() ([]byte, error) { func (b ByteEncoder) Length() int { return len(b) } + +// bufConn wraps a net.Conn with a buffer for reads to reduce the number of +// reads that trigger syscalls. +type bufConn struct { + net.Conn + buf *bufio.Reader +} + +func newBufConn(conn net.Conn) *bufConn { + return &bufConn{ + Conn: conn, + buf: bufio.NewReader(conn), + } +} + +func (bc *bufConn) Read(b []byte) (n int, err error) { + return bc.buf.Read(b) +} diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/.gitignore b/vendor/github.com/Sirupsen/logrus/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/.gitignore rename to vendor/github.com/Sirupsen/logrus/.gitignore diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/.travis.yml b/vendor/github.com/Sirupsen/logrus/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/.travis.yml rename to vendor/github.com/Sirupsen/logrus/.travis.yml diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/CHANGELOG.md b/vendor/github.com/Sirupsen/logrus/CHANGELOG.md similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/CHANGELOG.md rename to vendor/github.com/Sirupsen/logrus/CHANGELOG.md diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/LICENSE b/vendor/github.com/Sirupsen/logrus/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/LICENSE rename to vendor/github.com/Sirupsen/logrus/LICENSE diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/README.md b/vendor/github.com/Sirupsen/logrus/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/README.md rename to vendor/github.com/Sirupsen/logrus/README.md diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/entry.go b/vendor/github.com/Sirupsen/logrus/entry.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/entry.go rename to vendor/github.com/Sirupsen/logrus/entry.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/exported.go b/vendor/github.com/Sirupsen/logrus/exported.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/exported.go rename to vendor/github.com/Sirupsen/logrus/exported.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatter.go b/vendor/github.com/Sirupsen/logrus/formatter.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/formatter.go rename to vendor/github.com/Sirupsen/logrus/formatter.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks.go b/vendor/github.com/Sirupsen/logrus/hooks.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks.go rename to vendor/github.com/Sirupsen/logrus/hooks.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/json_formatter.go b/vendor/github.com/Sirupsen/logrus/json_formatter.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/json_formatter.go rename to vendor/github.com/Sirupsen/logrus/json_formatter.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/logger.go b/vendor/github.com/Sirupsen/logrus/logger.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/logger.go rename to vendor/github.com/Sirupsen/logrus/logger.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/logrus.go b/vendor/github.com/Sirupsen/logrus/logrus.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/logrus.go rename to vendor/github.com/Sirupsen/logrus/logrus.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_darwin.go b/vendor/github.com/Sirupsen/logrus/terminal_darwin.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_darwin.go rename to vendor/github.com/Sirupsen/logrus/terminal_darwin.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_freebsd.go b/vendor/github.com/Sirupsen/logrus/terminal_freebsd.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_freebsd.go rename to vendor/github.com/Sirupsen/logrus/terminal_freebsd.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_linux.go b/vendor/github.com/Sirupsen/logrus/terminal_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_linux.go rename to vendor/github.com/Sirupsen/logrus/terminal_linux.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_notwindows.go b/vendor/github.com/Sirupsen/logrus/terminal_notwindows.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_notwindows.go rename to vendor/github.com/Sirupsen/logrus/terminal_notwindows.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_openbsd.go b/vendor/github.com/Sirupsen/logrus/terminal_openbsd.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_openbsd.go rename to vendor/github.com/Sirupsen/logrus/terminal_openbsd.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_windows.go b/vendor/github.com/Sirupsen/logrus/terminal_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_windows.go rename to vendor/github.com/Sirupsen/logrus/terminal_windows.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/text_formatter.go b/vendor/github.com/Sirupsen/logrus/text_formatter.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/text_formatter.go rename to vendor/github.com/Sirupsen/logrus/text_formatter.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/writer.go b/vendor/github.com/Sirupsen/logrus/writer.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/writer.go rename to vendor/github.com/Sirupsen/logrus/writer.go diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/.gitignore b/vendor/github.com/abbot/go-http-auth/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/.gitignore rename to vendor/github.com/abbot/go-http-auth/.gitignore diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/LICENSE b/vendor/github.com/abbot/go-http-auth/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/LICENSE rename to vendor/github.com/abbot/go-http-auth/LICENSE diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/Makefile b/vendor/github.com/abbot/go-http-auth/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/Makefile rename to vendor/github.com/abbot/go-http-auth/Makefile diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/README.md b/vendor/github.com/abbot/go-http-auth/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/README.md rename to vendor/github.com/abbot/go-http-auth/README.md diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/auth.go b/vendor/github.com/abbot/go-http-auth/auth.go similarity index 99% rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/auth.go rename to vendor/github.com/abbot/go-http-auth/auth.go index c4eb5639..e87ce6f0 100644 --- a/Godeps/_workspace/src/github.com/abbot/go-http-auth/auth.go +++ b/vendor/github.com/abbot/go-http-auth/auth.go @@ -2,12 +2,12 @@ package auth import "net/http" -/* +/* Request handlers must take AuthenticatedRequest instead of http.Request */ type AuthenticatedRequest struct { http.Request - /* + /* Authenticated user name. Current API implies that Username is never empty, which means that authentication is always done before calling the request handler. diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/basic.go b/vendor/github.com/abbot/go-http-auth/basic.go similarity index 100% rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/basic.go rename to vendor/github.com/abbot/go-http-auth/basic.go diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/digest.go b/vendor/github.com/abbot/go-http-auth/digest.go similarity index 99% rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/digest.go rename to vendor/github.com/abbot/go-http-auth/digest.go index b3225ee4..e52f9dfa 100644 --- a/Godeps/_workspace/src/github.com/abbot/go-http-auth/digest.go +++ b/vendor/github.com/abbot/go-http-auth/digest.go @@ -22,7 +22,7 @@ type DigestAuth struct { Secrets SecretProvider PlainTextSecrets bool - /* + /* Approximate size of Client's Cache. When actual number of tracked client nonces exceeds ClientCacheSize+ClientCacheTolerance, ClientCacheTolerance*2 @@ -108,7 +108,7 @@ func DigestAuthParams(r *http.Request) map[string]string { return result } -/* +/* Check if request contains valid authentication data. Returns a pair of username, authinfo where username is the name of the authenticated user or an empty string and authinfo is the contents for the optional @@ -178,7 +178,7 @@ func (da *DigestAuth) CheckAuth(r *http.Request) (username string, authinfo *str const DefaultClientCacheSize = 1000 const DefaultClientCacheTolerance = 100 -/* +/* Wrap returns an Authenticator which uses HTTP Digest authentication. Arguments: @@ -201,7 +201,7 @@ func (a *DigestAuth) Wrap(wrapped AuthenticatedHandlerFunc) http.HandlerFunc { } } -/* +/* JustCheck returns function which converts an http.HandlerFunc into a http.HandlerFunc which requires authentication. Username is passed as an extra X-Authenticated-Username header. diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/md5crypt.go b/vendor/github.com/abbot/go-http-auth/md5crypt.go similarity index 100% rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/md5crypt.go rename to vendor/github.com/abbot/go-http-auth/md5crypt.go diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/misc.go b/vendor/github.com/abbot/go-http-auth/misc.go similarity index 100% rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/misc.go rename to vendor/github.com/abbot/go-http-auth/misc.go diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/test.htdigest b/vendor/github.com/abbot/go-http-auth/test.htdigest similarity index 100% rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/test.htdigest rename to vendor/github.com/abbot/go-http-auth/test.htdigest diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/test.htpasswd b/vendor/github.com/abbot/go-http-auth/test.htpasswd similarity index 100% rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/test.htpasswd rename to vendor/github.com/abbot/go-http-auth/test.htpasswd diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/users.go b/vendor/github.com/abbot/go-http-auth/users.go similarity index 99% rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/users.go rename to vendor/github.com/abbot/go-http-auth/users.go index 5e7d0b8d..376a8ad6 100644 --- a/Godeps/_workspace/src/github.com/abbot/go-http-auth/users.go +++ b/vendor/github.com/abbot/go-http-auth/users.go @@ -3,7 +3,7 @@ package auth import "encoding/csv" import "os" -/* +/* SecretProvider is used by authenticators. Takes user name and realm as an argument, returns secret required for authentication (HA1 for digest authentication, properly encrypted password for basic). diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/LICENSE.txt b/vendor/github.com/aws/aws-sdk-go/LICENSE.txt similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/LICENSE.txt rename to vendor/github.com/aws/aws-sdk-go/LICENSE.txt diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/NOTICE.txt b/vendor/github.com/aws/aws-sdk-go/NOTICE.txt similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/NOTICE.txt rename to vendor/github.com/aws/aws-sdk-go/NOTICE.txt diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/error.go b/vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/error.go rename to vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/types.go b/vendor/github.com/aws/aws-sdk-go/aws/awserr/types.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/types.go rename to vendor/github.com/aws/aws-sdk-go/aws/awserr/types.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy.go rename to vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/equal.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/equal.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/equal.go rename to vendor/github.com/aws/aws-sdk-go/aws/awsutil/equal.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go rename to vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go rename to vendor/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go rename to vendor/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/client.go b/vendor/github.com/aws/aws-sdk-go/aws/client/client.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/client.go rename to vendor/github.com/aws/aws-sdk-go/aws/client/client.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/default_retryer.go b/vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/default_retryer.go rename to vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go b/vendor/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go rename to vendor/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config.go b/vendor/github.com/aws/aws-sdk-go/aws/config.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config.go rename to vendor/github.com/aws/aws-sdk-go/aws/config.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/convert_types.go b/vendor/github.com/aws/aws-sdk-go/aws/convert_types.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/convert_types.go rename to vendor/github.com/aws/aws-sdk-go/aws/convert_types.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go rename to vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go rename to vendor/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/credentials.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/credentials.go rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/example.ini b/vendor/github.com/aws/aws-sdk-go/aws/credentials/example.ini similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/example.ini rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/example.ini diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/defaults/defaults.go b/vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/defaults/defaults.go rename to vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go rename to vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go rename to vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/errors.go b/vendor/github.com/aws/aws-sdk-go/aws/errors.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/errors.go rename to vendor/github.com/aws/aws-sdk-go/aws/errors.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/logger.go b/vendor/github.com/aws/aws-sdk-go/aws/logger.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/logger.go rename to vendor/github.com/aws/aws-sdk-go/aws/logger.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/handlers.go b/vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/handlers.go rename to vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request.go rename to vendor/github.com/aws/aws-sdk-go/aws/request/request.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request_pagination.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request_pagination.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request_pagination.go rename to vendor/github.com/aws/aws-sdk-go/aws/request/request_pagination.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/retryer.go b/vendor/github.com/aws/aws-sdk-go/aws/request/retryer.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/retryer.go rename to vendor/github.com/aws/aws-sdk-go/aws/request/retryer.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/session/session.go b/vendor/github.com/aws/aws-sdk-go/aws/session/session.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/session/session.go rename to vendor/github.com/aws/aws-sdk-go/aws/session/session.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/types.go b/vendor/github.com/aws/aws-sdk-go/aws/types.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/types.go rename to vendor/github.com/aws/aws-sdk-go/aws/types.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/version.go b/vendor/github.com/aws/aws-sdk-go/aws/version.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/version.go rename to vendor/github.com/aws/aws-sdk-go/aws/version.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/endpoints/endpoints.go b/vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/endpoints/endpoints.go rename to vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/endpoints/endpoints.json b/vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints.json similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/endpoints/endpoints.json rename to vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints.json diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/endpoints/endpoints_map.go b/vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints_map.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/endpoints/endpoints_map.go rename to vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints_map.go diff --git a/Godeps/_workspace/src/github.com/beorn7/perks/quantile/exampledata.txt b/vendor/github.com/beorn7/perks/quantile/exampledata.txt similarity index 100% rename from Godeps/_workspace/src/github.com/beorn7/perks/quantile/exampledata.txt rename to vendor/github.com/beorn7/perks/quantile/exampledata.txt diff --git a/Godeps/_workspace/src/github.com/beorn7/perks/quantile/stream.go b/vendor/github.com/beorn7/perks/quantile/stream.go similarity index 100% rename from Godeps/_workspace/src/github.com/beorn7/perks/quantile/stream.go rename to vendor/github.com/beorn7/perks/quantile/stream.go diff --git a/Godeps/_workspace/src/github.com/blang/semver/LICENSE b/vendor/github.com/blang/semver/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/blang/semver/LICENSE rename to vendor/github.com/blang/semver/LICENSE diff --git a/Godeps/_workspace/src/github.com/blang/semver/README.md b/vendor/github.com/blang/semver/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/blang/semver/README.md rename to vendor/github.com/blang/semver/README.md diff --git a/Godeps/_workspace/src/github.com/blang/semver/json.go b/vendor/github.com/blang/semver/json.go similarity index 100% rename from Godeps/_workspace/src/github.com/blang/semver/json.go rename to vendor/github.com/blang/semver/json.go diff --git a/Godeps/_workspace/src/github.com/blang/semver/range.go b/vendor/github.com/blang/semver/range.go similarity index 100% rename from Godeps/_workspace/src/github.com/blang/semver/range.go rename to vendor/github.com/blang/semver/range.go diff --git a/Godeps/_workspace/src/github.com/blang/semver/semver.go b/vendor/github.com/blang/semver/semver.go similarity index 100% rename from Godeps/_workspace/src/github.com/blang/semver/semver.go rename to vendor/github.com/blang/semver/semver.go diff --git a/Godeps/_workspace/src/github.com/blang/semver/sort.go b/vendor/github.com/blang/semver/sort.go similarity index 100% rename from Godeps/_workspace/src/github.com/blang/semver/sort.go rename to vendor/github.com/blang/semver/sort.go diff --git a/Godeps/_workspace/src/github.com/blang/semver/sql.go b/vendor/github.com/blang/semver/sql.go similarity index 100% rename from Godeps/_workspace/src/github.com/blang/semver/sql.go rename to vendor/github.com/blang/semver/sql.go diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/LICENSE b/vendor/github.com/coreos/go-systemd/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/go-systemd/LICENSE rename to vendor/github.com/coreos/go-systemd/LICENSE diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/dbus.go b/vendor/github.com/coreos/go-systemd/dbus/dbus.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/dbus.go rename to vendor/github.com/coreos/go-systemd/dbus/dbus.go diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go b/vendor/github.com/coreos/go-systemd/dbus/methods.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go rename to vendor/github.com/coreos/go-systemd/dbus/methods.go diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/properties.go b/vendor/github.com/coreos/go-systemd/dbus/properties.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/properties.go rename to vendor/github.com/coreos/go-systemd/dbus/properties.go diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/set.go b/vendor/github.com/coreos/go-systemd/dbus/set.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/set.go rename to vendor/github.com/coreos/go-systemd/dbus/set.go diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription.go b/vendor/github.com/coreos/go-systemd/dbus/subscription.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription.go rename to vendor/github.com/coreos/go-systemd/dbus/subscription.go diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription_set.go b/vendor/github.com/coreos/go-systemd/dbus/subscription_set.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription_set.go rename to vendor/github.com/coreos/go-systemd/dbus/subscription_set.go diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/util/util.go b/vendor/github.com/coreos/go-systemd/util/util.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/go-systemd/util/util.go rename to vendor/github.com/coreos/go-systemd/util/util.go diff --git a/Godeps/_workspace/src/github.com/coreos/rkt/LICENSE b/vendor/github.com/coreos/rkt/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/rkt/LICENSE rename to vendor/github.com/coreos/rkt/LICENSE diff --git a/Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/README.md b/vendor/github.com/coreos/rkt/api/v1alpha/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/README.md rename to vendor/github.com/coreos/rkt/api/v1alpha/README.md diff --git a/Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/api.pb.go b/vendor/github.com/coreos/rkt/api/v1alpha/api.pb.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/api.pb.go rename to vendor/github.com/coreos/rkt/api/v1alpha/api.pb.go diff --git a/Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/api.proto b/vendor/github.com/coreos/rkt/api/v1alpha/api.proto similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/api.proto rename to vendor/github.com/coreos/rkt/api/v1alpha/api.proto diff --git a/Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/client_example.go b/vendor/github.com/coreos/rkt/api/v1alpha/client_example.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/client_example.go rename to vendor/github.com/coreos/rkt/api/v1alpha/client_example.go diff --git a/Godeps/_workspace/src/github.com/docker/distribution/LICENSE b/vendor/github.com/docker/distribution/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/docker/distribution/LICENSE rename to vendor/github.com/docker/distribution/LICENSE diff --git a/Godeps/_workspace/src/github.com/docker/distribution/digest/digest.go b/vendor/github.com/docker/distribution/digest/digest.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/distribution/digest/digest.go rename to vendor/github.com/docker/distribution/digest/digest.go diff --git a/Godeps/_workspace/src/github.com/docker/distribution/digest/digester.go b/vendor/github.com/docker/distribution/digest/digester.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/distribution/digest/digester.go rename to vendor/github.com/docker/distribution/digest/digester.go diff --git a/Godeps/_workspace/src/github.com/docker/distribution/digest/doc.go b/vendor/github.com/docker/distribution/digest/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/distribution/digest/doc.go rename to vendor/github.com/docker/distribution/digest/doc.go diff --git a/Godeps/_workspace/src/github.com/docker/distribution/digest/set.go b/vendor/github.com/docker/distribution/digest/set.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/distribution/digest/set.go rename to vendor/github.com/docker/distribution/digest/set.go diff --git a/Godeps/_workspace/src/github.com/docker/distribution/digest/verifiers.go b/vendor/github.com/docker/distribution/digest/verifiers.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/distribution/digest/verifiers.go rename to vendor/github.com/docker/distribution/digest/verifiers.go diff --git a/Godeps/_workspace/src/github.com/docker/distribution/reference/reference.go b/vendor/github.com/docker/distribution/reference/reference.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/distribution/reference/reference.go rename to vendor/github.com/docker/distribution/reference/reference.go diff --git a/Godeps/_workspace/src/github.com/docker/distribution/reference/regexp.go b/vendor/github.com/docker/distribution/reference/regexp.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/distribution/reference/regexp.go rename to vendor/github.com/docker/distribution/reference/regexp.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/LICENSE b/vendor/github.com/docker/docker/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/LICENSE rename to vendor/github.com/docker/docker/LICENSE diff --git a/Godeps/_workspace/src/github.com/docker/docker/NOTICE b/vendor/github.com/docker/docker/NOTICE similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/NOTICE rename to vendor/github.com/docker/docker/NOTICE diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/longpath/longpath.go b/vendor/github.com/docker/docker/pkg/longpath/longpath.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/longpath/longpath.go rename to vendor/github.com/docker/docker/pkg/longpath/longpath.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags.go b/vendor/github.com/docker/docker/pkg/mount/flags.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags.go rename to vendor/github.com/docker/docker/pkg/mount/flags.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags_freebsd.go b/vendor/github.com/docker/docker/pkg/mount/flags_freebsd.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags_freebsd.go rename to vendor/github.com/docker/docker/pkg/mount/flags_freebsd.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags_linux.go b/vendor/github.com/docker/docker/pkg/mount/flags_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags_linux.go rename to vendor/github.com/docker/docker/pkg/mount/flags_linux.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags_unsupported.go b/vendor/github.com/docker/docker/pkg/mount/flags_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags_unsupported.go rename to vendor/github.com/docker/docker/pkg/mount/flags_unsupported.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mount.go b/vendor/github.com/docker/docker/pkg/mount/mount.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mount.go rename to vendor/github.com/docker/docker/pkg/mount/mount.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mounter_freebsd.go b/vendor/github.com/docker/docker/pkg/mount/mounter_freebsd.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mounter_freebsd.go rename to vendor/github.com/docker/docker/pkg/mount/mounter_freebsd.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mounter_linux.go b/vendor/github.com/docker/docker/pkg/mount/mounter_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mounter_linux.go rename to vendor/github.com/docker/docker/pkg/mount/mounter_linux.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mounter_unsupported.go b/vendor/github.com/docker/docker/pkg/mount/mounter_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mounter_unsupported.go rename to vendor/github.com/docker/docker/pkg/mount/mounter_unsupported.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo.go b/vendor/github.com/docker/docker/pkg/mount/mountinfo.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo.go rename to vendor/github.com/docker/docker/pkg/mount/mountinfo.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go b/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go rename to vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo_linux.go b/vendor/github.com/docker/docker/pkg/mount/mountinfo_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo_linux.go rename to vendor/github.com/docker/docker/pkg/mount/mountinfo_linux.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo_unsupported.go b/vendor/github.com/docker/docker/pkg/mount/mountinfo_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo_unsupported.go rename to vendor/github.com/docker/docker/pkg/mount/mountinfo_unsupported.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/sharedsubtree_linux.go b/vendor/github.com/docker/docker/pkg/mount/sharedsubtree_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/sharedsubtree_linux.go rename to vendor/github.com/docker/docker/pkg/mount/sharedsubtree_linux.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.APACHE b/vendor/github.com/docker/docker/pkg/symlink/LICENSE.APACHE similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.APACHE rename to vendor/github.com/docker/docker/pkg/symlink/LICENSE.APACHE diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.BSD b/vendor/github.com/docker/docker/pkg/symlink/LICENSE.BSD similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.BSD rename to vendor/github.com/docker/docker/pkg/symlink/LICENSE.BSD diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/README.md b/vendor/github.com/docker/docker/pkg/symlink/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/README.md rename to vendor/github.com/docker/docker/pkg/symlink/README.md diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/fs.go b/vendor/github.com/docker/docker/pkg/symlink/fs.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/fs.go rename to vendor/github.com/docker/docker/pkg/symlink/fs.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/fs_unix.go b/vendor/github.com/docker/docker/pkg/symlink/fs_unix.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/fs_unix.go rename to vendor/github.com/docker/docker/pkg/symlink/fs_unix.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/fs_windows.go b/vendor/github.com/docker/docker/pkg/symlink/fs_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/fs_windows.go rename to vendor/github.com/docker/docker/pkg/symlink/fs_windows.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/chtimes.go b/vendor/github.com/docker/docker/pkg/system/chtimes.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/chtimes.go rename to vendor/github.com/docker/docker/pkg/system/chtimes.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/errors.go b/vendor/github.com/docker/docker/pkg/system/errors.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/errors.go rename to vendor/github.com/docker/docker/pkg/system/errors.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/events_windows.go b/vendor/github.com/docker/docker/pkg/system/events_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/events_windows.go rename to vendor/github.com/docker/docker/pkg/system/events_windows.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/filesys.go b/vendor/github.com/docker/docker/pkg/system/filesys.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/filesys.go rename to vendor/github.com/docker/docker/pkg/system/filesys.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/filesys_windows.go b/vendor/github.com/docker/docker/pkg/system/filesys_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/filesys_windows.go rename to vendor/github.com/docker/docker/pkg/system/filesys_windows.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/lstat.go b/vendor/github.com/docker/docker/pkg/system/lstat.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/lstat.go rename to vendor/github.com/docker/docker/pkg/system/lstat.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/lstat_windows.go b/vendor/github.com/docker/docker/pkg/system/lstat_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/lstat_windows.go rename to vendor/github.com/docker/docker/pkg/system/lstat_windows.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/meminfo.go b/vendor/github.com/docker/docker/pkg/system/meminfo.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/meminfo.go rename to vendor/github.com/docker/docker/pkg/system/meminfo.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/meminfo_linux.go b/vendor/github.com/docker/docker/pkg/system/meminfo_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/meminfo_linux.go rename to vendor/github.com/docker/docker/pkg/system/meminfo_linux.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/meminfo_unsupported.go b/vendor/github.com/docker/docker/pkg/system/meminfo_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/meminfo_unsupported.go rename to vendor/github.com/docker/docker/pkg/system/meminfo_unsupported.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/meminfo_windows.go b/vendor/github.com/docker/docker/pkg/system/meminfo_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/meminfo_windows.go rename to vendor/github.com/docker/docker/pkg/system/meminfo_windows.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/mknod.go b/vendor/github.com/docker/docker/pkg/system/mknod.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/mknod.go rename to vendor/github.com/docker/docker/pkg/system/mknod.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/mknod_windows.go b/vendor/github.com/docker/docker/pkg/system/mknod_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/mknod_windows.go rename to vendor/github.com/docker/docker/pkg/system/mknod_windows.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/stat.go b/vendor/github.com/docker/docker/pkg/system/stat.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/stat.go rename to vendor/github.com/docker/docker/pkg/system/stat.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/stat_freebsd.go b/vendor/github.com/docker/docker/pkg/system/stat_freebsd.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/stat_freebsd.go rename to vendor/github.com/docker/docker/pkg/system/stat_freebsd.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/stat_linux.go b/vendor/github.com/docker/docker/pkg/system/stat_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/stat_linux.go rename to vendor/github.com/docker/docker/pkg/system/stat_linux.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/stat_unsupported.go b/vendor/github.com/docker/docker/pkg/system/stat_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/stat_unsupported.go rename to vendor/github.com/docker/docker/pkg/system/stat_unsupported.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/stat_windows.go b/vendor/github.com/docker/docker/pkg/system/stat_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/stat_windows.go rename to vendor/github.com/docker/docker/pkg/system/stat_windows.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/umask.go b/vendor/github.com/docker/docker/pkg/system/umask.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/umask.go rename to vendor/github.com/docker/docker/pkg/system/umask.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/umask_windows.go b/vendor/github.com/docker/docker/pkg/system/umask_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/umask_windows.go rename to vendor/github.com/docker/docker/pkg/system/umask_windows.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/utimes_darwin.go b/vendor/github.com/docker/docker/pkg/system/utimes_darwin.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/utimes_darwin.go rename to vendor/github.com/docker/docker/pkg/system/utimes_darwin.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/utimes_freebsd.go b/vendor/github.com/docker/docker/pkg/system/utimes_freebsd.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/utimes_freebsd.go rename to vendor/github.com/docker/docker/pkg/system/utimes_freebsd.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/utimes_linux.go b/vendor/github.com/docker/docker/pkg/system/utimes_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/utimes_linux.go rename to vendor/github.com/docker/docker/pkg/system/utimes_linux.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/utimes_unsupported.go b/vendor/github.com/docker/docker/pkg/system/utimes_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/utimes_unsupported.go rename to vendor/github.com/docker/docker/pkg/system/utimes_unsupported.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/xattrs_linux.go b/vendor/github.com/docker/docker/pkg/system/xattrs_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/xattrs_linux.go rename to vendor/github.com/docker/docker/pkg/system/xattrs_linux.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/xattrs_unsupported.go b/vendor/github.com/docker/docker/pkg/system/xattrs_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/xattrs_unsupported.go rename to vendor/github.com/docker/docker/pkg/system/xattrs_unsupported.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/units/duration.go b/vendor/github.com/docker/docker/pkg/units/duration.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/units/duration.go rename to vendor/github.com/docker/docker/pkg/units/duration.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/units/size.go b/vendor/github.com/docker/docker/pkg/units/size.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/units/size.go rename to vendor/github.com/docker/docker/pkg/units/size.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/LICENSE b/vendor/github.com/docker/engine-api/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/LICENSE rename to vendor/github.com/docker/engine-api/LICENSE diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/client.go b/vendor/github.com/docker/engine-api/client/client.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/client.go rename to vendor/github.com/docker/engine-api/client/client.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/client_darwin.go b/vendor/github.com/docker/engine-api/client/client_darwin.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/client_darwin.go rename to vendor/github.com/docker/engine-api/client/client_darwin.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/client_unix.go b/vendor/github.com/docker/engine-api/client/client_unix.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/client_unix.go rename to vendor/github.com/docker/engine-api/client/client_unix.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/client_windows.go b/vendor/github.com/docker/engine-api/client/client_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/client_windows.go rename to vendor/github.com/docker/engine-api/client/client_windows.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_attach.go b/vendor/github.com/docker/engine-api/client/container_attach.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_attach.go rename to vendor/github.com/docker/engine-api/client/container_attach.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_commit.go b/vendor/github.com/docker/engine-api/client/container_commit.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_commit.go rename to vendor/github.com/docker/engine-api/client/container_commit.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_copy.go b/vendor/github.com/docker/engine-api/client/container_copy.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_copy.go rename to vendor/github.com/docker/engine-api/client/container_copy.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_create.go b/vendor/github.com/docker/engine-api/client/container_create.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_create.go rename to vendor/github.com/docker/engine-api/client/container_create.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_diff.go b/vendor/github.com/docker/engine-api/client/container_diff.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_diff.go rename to vendor/github.com/docker/engine-api/client/container_diff.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_exec.go b/vendor/github.com/docker/engine-api/client/container_exec.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_exec.go rename to vendor/github.com/docker/engine-api/client/container_exec.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_export.go b/vendor/github.com/docker/engine-api/client/container_export.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_export.go rename to vendor/github.com/docker/engine-api/client/container_export.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_inspect.go b/vendor/github.com/docker/engine-api/client/container_inspect.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_inspect.go rename to vendor/github.com/docker/engine-api/client/container_inspect.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_kill.go b/vendor/github.com/docker/engine-api/client/container_kill.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_kill.go rename to vendor/github.com/docker/engine-api/client/container_kill.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_list.go b/vendor/github.com/docker/engine-api/client/container_list.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_list.go rename to vendor/github.com/docker/engine-api/client/container_list.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_logs.go b/vendor/github.com/docker/engine-api/client/container_logs.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_logs.go rename to vendor/github.com/docker/engine-api/client/container_logs.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_pause.go b/vendor/github.com/docker/engine-api/client/container_pause.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_pause.go rename to vendor/github.com/docker/engine-api/client/container_pause.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_remove.go b/vendor/github.com/docker/engine-api/client/container_remove.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_remove.go rename to vendor/github.com/docker/engine-api/client/container_remove.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_rename.go b/vendor/github.com/docker/engine-api/client/container_rename.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_rename.go rename to vendor/github.com/docker/engine-api/client/container_rename.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_resize.go b/vendor/github.com/docker/engine-api/client/container_resize.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_resize.go rename to vendor/github.com/docker/engine-api/client/container_resize.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_restart.go b/vendor/github.com/docker/engine-api/client/container_restart.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_restart.go rename to vendor/github.com/docker/engine-api/client/container_restart.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_start.go b/vendor/github.com/docker/engine-api/client/container_start.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_start.go rename to vendor/github.com/docker/engine-api/client/container_start.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_stats.go b/vendor/github.com/docker/engine-api/client/container_stats.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_stats.go rename to vendor/github.com/docker/engine-api/client/container_stats.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_stop.go b/vendor/github.com/docker/engine-api/client/container_stop.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_stop.go rename to vendor/github.com/docker/engine-api/client/container_stop.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_top.go b/vendor/github.com/docker/engine-api/client/container_top.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_top.go rename to vendor/github.com/docker/engine-api/client/container_top.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_unpause.go b/vendor/github.com/docker/engine-api/client/container_unpause.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_unpause.go rename to vendor/github.com/docker/engine-api/client/container_unpause.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_update.go b/vendor/github.com/docker/engine-api/client/container_update.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_update.go rename to vendor/github.com/docker/engine-api/client/container_update.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_wait.go b/vendor/github.com/docker/engine-api/client/container_wait.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_wait.go rename to vendor/github.com/docker/engine-api/client/container_wait.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/errors.go b/vendor/github.com/docker/engine-api/client/errors.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/errors.go rename to vendor/github.com/docker/engine-api/client/errors.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/events.go b/vendor/github.com/docker/engine-api/client/events.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/events.go rename to vendor/github.com/docker/engine-api/client/events.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/hijack.go b/vendor/github.com/docker/engine-api/client/hijack.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/hijack.go rename to vendor/github.com/docker/engine-api/client/hijack.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_build.go b/vendor/github.com/docker/engine-api/client/image_build.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_build.go rename to vendor/github.com/docker/engine-api/client/image_build.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_create.go b/vendor/github.com/docker/engine-api/client/image_create.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_create.go rename to vendor/github.com/docker/engine-api/client/image_create.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_history.go b/vendor/github.com/docker/engine-api/client/image_history.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_history.go rename to vendor/github.com/docker/engine-api/client/image_history.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_import.go b/vendor/github.com/docker/engine-api/client/image_import.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_import.go rename to vendor/github.com/docker/engine-api/client/image_import.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_inspect.go b/vendor/github.com/docker/engine-api/client/image_inspect.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_inspect.go rename to vendor/github.com/docker/engine-api/client/image_inspect.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_list.go b/vendor/github.com/docker/engine-api/client/image_list.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_list.go rename to vendor/github.com/docker/engine-api/client/image_list.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_load.go b/vendor/github.com/docker/engine-api/client/image_load.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_load.go rename to vendor/github.com/docker/engine-api/client/image_load.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_pull.go b/vendor/github.com/docker/engine-api/client/image_pull.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_pull.go rename to vendor/github.com/docker/engine-api/client/image_pull.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_push.go b/vendor/github.com/docker/engine-api/client/image_push.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_push.go rename to vendor/github.com/docker/engine-api/client/image_push.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_remove.go b/vendor/github.com/docker/engine-api/client/image_remove.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_remove.go rename to vendor/github.com/docker/engine-api/client/image_remove.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_save.go b/vendor/github.com/docker/engine-api/client/image_save.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_save.go rename to vendor/github.com/docker/engine-api/client/image_save.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_search.go b/vendor/github.com/docker/engine-api/client/image_search.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_search.go rename to vendor/github.com/docker/engine-api/client/image_search.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_tag.go b/vendor/github.com/docker/engine-api/client/image_tag.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_tag.go rename to vendor/github.com/docker/engine-api/client/image_tag.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/info.go b/vendor/github.com/docker/engine-api/client/info.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/info.go rename to vendor/github.com/docker/engine-api/client/info.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/interface.go b/vendor/github.com/docker/engine-api/client/interface.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/interface.go rename to vendor/github.com/docker/engine-api/client/interface.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/login.go b/vendor/github.com/docker/engine-api/client/login.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/login.go rename to vendor/github.com/docker/engine-api/client/login.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/network_connect.go b/vendor/github.com/docker/engine-api/client/network_connect.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/network_connect.go rename to vendor/github.com/docker/engine-api/client/network_connect.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/network_create.go b/vendor/github.com/docker/engine-api/client/network_create.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/network_create.go rename to vendor/github.com/docker/engine-api/client/network_create.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/network_disconnect.go b/vendor/github.com/docker/engine-api/client/network_disconnect.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/network_disconnect.go rename to vendor/github.com/docker/engine-api/client/network_disconnect.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/network_inspect.go b/vendor/github.com/docker/engine-api/client/network_inspect.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/network_inspect.go rename to vendor/github.com/docker/engine-api/client/network_inspect.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/network_list.go b/vendor/github.com/docker/engine-api/client/network_list.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/network_list.go rename to vendor/github.com/docker/engine-api/client/network_list.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/network_remove.go b/vendor/github.com/docker/engine-api/client/network_remove.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/network_remove.go rename to vendor/github.com/docker/engine-api/client/network_remove.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/privileged.go b/vendor/github.com/docker/engine-api/client/privileged.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/privileged.go rename to vendor/github.com/docker/engine-api/client/privileged.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/request.go b/vendor/github.com/docker/engine-api/client/request.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/request.go rename to vendor/github.com/docker/engine-api/client/request.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/transport/cancellable/canceler.go b/vendor/github.com/docker/engine-api/client/transport/cancellable/canceler.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/transport/cancellable/canceler.go rename to vendor/github.com/docker/engine-api/client/transport/cancellable/canceler.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/transport/cancellable/canceler_go14.go b/vendor/github.com/docker/engine-api/client/transport/cancellable/canceler_go14.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/transport/cancellable/canceler_go14.go rename to vendor/github.com/docker/engine-api/client/transport/cancellable/canceler_go14.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/transport/cancellable/cancellable.go b/vendor/github.com/docker/engine-api/client/transport/cancellable/cancellable.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/transport/cancellable/cancellable.go rename to vendor/github.com/docker/engine-api/client/transport/cancellable/cancellable.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/transport/client.go b/vendor/github.com/docker/engine-api/client/transport/client.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/transport/client.go rename to vendor/github.com/docker/engine-api/client/transport/client.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/transport/transport.go b/vendor/github.com/docker/engine-api/client/transport/transport.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/transport/transport.go rename to vendor/github.com/docker/engine-api/client/transport/transport.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/version.go b/vendor/github.com/docker/engine-api/client/version.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/version.go rename to vendor/github.com/docker/engine-api/client/version.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/volume_create.go b/vendor/github.com/docker/engine-api/client/volume_create.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/volume_create.go rename to vendor/github.com/docker/engine-api/client/volume_create.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/volume_inspect.go b/vendor/github.com/docker/engine-api/client/volume_inspect.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/volume_inspect.go rename to vendor/github.com/docker/engine-api/client/volume_inspect.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/volume_list.go b/vendor/github.com/docker/engine-api/client/volume_list.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/volume_list.go rename to vendor/github.com/docker/engine-api/client/volume_list.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/volume_remove.go b/vendor/github.com/docker/engine-api/client/volume_remove.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/client/volume_remove.go rename to vendor/github.com/docker/engine-api/client/volume_remove.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/auth.go b/vendor/github.com/docker/engine-api/types/auth.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/types/auth.go rename to vendor/github.com/docker/engine-api/types/auth.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/blkiodev/blkio.go b/vendor/github.com/docker/engine-api/types/blkiodev/blkio.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/types/blkiodev/blkio.go rename to vendor/github.com/docker/engine-api/types/blkiodev/blkio.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/client.go b/vendor/github.com/docker/engine-api/types/client.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/types/client.go rename to vendor/github.com/docker/engine-api/types/client.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/configs.go b/vendor/github.com/docker/engine-api/types/configs.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/types/configs.go rename to vendor/github.com/docker/engine-api/types/configs.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/container/config.go b/vendor/github.com/docker/engine-api/types/container/config.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/types/container/config.go rename to vendor/github.com/docker/engine-api/types/container/config.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/container/host_config.go b/vendor/github.com/docker/engine-api/types/container/host_config.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/types/container/host_config.go rename to vendor/github.com/docker/engine-api/types/container/host_config.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/container/hostconfig_unix.go b/vendor/github.com/docker/engine-api/types/container/hostconfig_unix.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/types/container/hostconfig_unix.go rename to vendor/github.com/docker/engine-api/types/container/hostconfig_unix.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/container/hostconfig_windows.go b/vendor/github.com/docker/engine-api/types/container/hostconfig_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/types/container/hostconfig_windows.go rename to vendor/github.com/docker/engine-api/types/container/hostconfig_windows.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/filters/parse.go b/vendor/github.com/docker/engine-api/types/filters/parse.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/types/filters/parse.go rename to vendor/github.com/docker/engine-api/types/filters/parse.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/network/network.go b/vendor/github.com/docker/engine-api/types/network/network.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/types/network/network.go rename to vendor/github.com/docker/engine-api/types/network/network.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/reference/image_reference.go b/vendor/github.com/docker/engine-api/types/reference/image_reference.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/types/reference/image_reference.go rename to vendor/github.com/docker/engine-api/types/reference/image_reference.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/registry/registry.go b/vendor/github.com/docker/engine-api/types/registry/registry.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/types/registry/registry.go rename to vendor/github.com/docker/engine-api/types/registry/registry.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/seccomp.go b/vendor/github.com/docker/engine-api/types/seccomp.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/types/seccomp.go rename to vendor/github.com/docker/engine-api/types/seccomp.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/stats.go b/vendor/github.com/docker/engine-api/types/stats.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/types/stats.go rename to vendor/github.com/docker/engine-api/types/stats.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/strslice/strslice.go b/vendor/github.com/docker/engine-api/types/strslice/strslice.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/types/strslice/strslice.go rename to vendor/github.com/docker/engine-api/types/strslice/strslice.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/time/timestamp.go b/vendor/github.com/docker/engine-api/types/time/timestamp.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/types/time/timestamp.go rename to vendor/github.com/docker/engine-api/types/time/timestamp.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/types.go b/vendor/github.com/docker/engine-api/types/types.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/types/types.go rename to vendor/github.com/docker/engine-api/types/types.go diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/versions/README.md b/vendor/github.com/docker/engine-api/types/versions/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/types/versions/README.md rename to vendor/github.com/docker/engine-api/types/versions/README.md diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/versions/compare.go b/vendor/github.com/docker/engine-api/types/versions/compare.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/engine-api/types/versions/compare.go rename to vendor/github.com/docker/engine-api/types/versions/compare.go diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/LICENSE b/vendor/github.com/docker/go-connections/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-connections/LICENSE rename to vendor/github.com/docker/go-connections/LICENSE diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/nat/nat.go b/vendor/github.com/docker/go-connections/nat/nat.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-connections/nat/nat.go rename to vendor/github.com/docker/go-connections/nat/nat.go diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/nat/parse.go b/vendor/github.com/docker/go-connections/nat/parse.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-connections/nat/parse.go rename to vendor/github.com/docker/go-connections/nat/parse.go diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/nat/sort.go b/vendor/github.com/docker/go-connections/nat/sort.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-connections/nat/sort.go rename to vendor/github.com/docker/go-connections/nat/sort.go diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/sockets/README.md b/vendor/github.com/docker/go-connections/sockets/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-connections/sockets/README.md rename to vendor/github.com/docker/go-connections/sockets/README.md diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/sockets/inmem_socket.go b/vendor/github.com/docker/go-connections/sockets/inmem_socket.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-connections/sockets/inmem_socket.go rename to vendor/github.com/docker/go-connections/sockets/inmem_socket.go diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/sockets/proxy.go b/vendor/github.com/docker/go-connections/sockets/proxy.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-connections/sockets/proxy.go rename to vendor/github.com/docker/go-connections/sockets/proxy.go diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/sockets/sockets.go b/vendor/github.com/docker/go-connections/sockets/sockets.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-connections/sockets/sockets.go rename to vendor/github.com/docker/go-connections/sockets/sockets.go diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/sockets/sockets_unix.go b/vendor/github.com/docker/go-connections/sockets/sockets_unix.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-connections/sockets/sockets_unix.go rename to vendor/github.com/docker/go-connections/sockets/sockets_unix.go diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/sockets/sockets_windows.go b/vendor/github.com/docker/go-connections/sockets/sockets_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-connections/sockets/sockets_windows.go rename to vendor/github.com/docker/go-connections/sockets/sockets_windows.go diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/sockets/tcp_socket.go b/vendor/github.com/docker/go-connections/sockets/tcp_socket.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-connections/sockets/tcp_socket.go rename to vendor/github.com/docker/go-connections/sockets/tcp_socket.go diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/sockets/unix_socket.go b/vendor/github.com/docker/go-connections/sockets/unix_socket.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-connections/sockets/unix_socket.go rename to vendor/github.com/docker/go-connections/sockets/unix_socket.go diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/tlsconfig/config.go b/vendor/github.com/docker/go-connections/tlsconfig/config.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-connections/tlsconfig/config.go rename to vendor/github.com/docker/go-connections/tlsconfig/config.go diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go b/vendor/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go rename to vendor/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/tlsconfig/config_legacy_client_ciphers.go b/vendor/github.com/docker/go-connections/tlsconfig/config_legacy_client_ciphers.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-connections/tlsconfig/config_legacy_client_ciphers.go rename to vendor/github.com/docker/go-connections/tlsconfig/config_legacy_client_ciphers.go diff --git a/Godeps/_workspace/src/github.com/docker/go-units/CONTRIBUTING.md b/vendor/github.com/docker/go-units/CONTRIBUTING.md similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-units/CONTRIBUTING.md rename to vendor/github.com/docker/go-units/CONTRIBUTING.md diff --git a/Godeps/_workspace/src/github.com/docker/go-units/LICENSE.code b/vendor/github.com/docker/go-units/LICENSE.code similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-units/LICENSE.code rename to vendor/github.com/docker/go-units/LICENSE.code diff --git a/Godeps/_workspace/src/github.com/docker/go-units/LICENSE.docs b/vendor/github.com/docker/go-units/LICENSE.docs similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-units/LICENSE.docs rename to vendor/github.com/docker/go-units/LICENSE.docs diff --git a/Godeps/_workspace/src/github.com/docker/go-units/MAINTAINERS b/vendor/github.com/docker/go-units/MAINTAINERS similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-units/MAINTAINERS rename to vendor/github.com/docker/go-units/MAINTAINERS diff --git a/Godeps/_workspace/src/github.com/docker/go-units/README.md b/vendor/github.com/docker/go-units/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-units/README.md rename to vendor/github.com/docker/go-units/README.md diff --git a/Godeps/_workspace/src/github.com/docker/go-units/circle.yml b/vendor/github.com/docker/go-units/circle.yml similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-units/circle.yml rename to vendor/github.com/docker/go-units/circle.yml diff --git a/Godeps/_workspace/src/github.com/docker/go-units/duration.go b/vendor/github.com/docker/go-units/duration.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-units/duration.go rename to vendor/github.com/docker/go-units/duration.go diff --git a/Godeps/_workspace/src/github.com/docker/go-units/size.go b/vendor/github.com/docker/go-units/size.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-units/size.go rename to vendor/github.com/docker/go-units/size.go diff --git a/Godeps/_workspace/src/github.com/docker/go-units/ulimit.go b/vendor/github.com/docker/go-units/ulimit.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/go-units/ulimit.go rename to vendor/github.com/docker/go-units/ulimit.go diff --git a/Godeps/_workspace/src/github.com/eapache/go-resiliency/LICENSE b/vendor/github.com/eapache/go-resiliency/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/eapache/go-resiliency/LICENSE rename to vendor/github.com/eapache/go-resiliency/LICENSE diff --git a/Godeps/_workspace/src/github.com/eapache/go-resiliency/breaker/README.md b/vendor/github.com/eapache/go-resiliency/breaker/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/eapache/go-resiliency/breaker/README.md rename to vendor/github.com/eapache/go-resiliency/breaker/README.md diff --git a/Godeps/_workspace/src/github.com/eapache/go-resiliency/breaker/breaker.go b/vendor/github.com/eapache/go-resiliency/breaker/breaker.go similarity index 100% rename from Godeps/_workspace/src/github.com/eapache/go-resiliency/breaker/breaker.go rename to vendor/github.com/eapache/go-resiliency/breaker/breaker.go diff --git a/Godeps/_workspace/src/github.com/eapache/queue/.gitignore b/vendor/github.com/eapache/queue/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/eapache/queue/.gitignore rename to vendor/github.com/eapache/queue/.gitignore diff --git a/Godeps/_workspace/src/github.com/eapache/queue/.travis.yml b/vendor/github.com/eapache/queue/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/eapache/queue/.travis.yml rename to vendor/github.com/eapache/queue/.travis.yml diff --git a/Godeps/_workspace/src/github.com/eapache/queue/LICENSE b/vendor/github.com/eapache/queue/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/eapache/queue/LICENSE rename to vendor/github.com/eapache/queue/LICENSE diff --git a/Godeps/_workspace/src/github.com/eapache/queue/README.md b/vendor/github.com/eapache/queue/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/eapache/queue/README.md rename to vendor/github.com/eapache/queue/README.md diff --git a/Godeps/_workspace/src/github.com/eapache/queue/queue.go b/vendor/github.com/eapache/queue/queue.go similarity index 100% rename from Godeps/_workspace/src/github.com/eapache/queue/queue.go rename to vendor/github.com/eapache/queue/queue.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/internal/commandinfo.go b/vendor/github.com/garyburd/redigo/internal/commandinfo.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/internal/commandinfo.go rename to vendor/github.com/garyburd/redigo/internal/commandinfo.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/conn.go b/vendor/github.com/garyburd/redigo/redis/conn.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/conn.go rename to vendor/github.com/garyburd/redigo/redis/conn.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/doc.go b/vendor/github.com/garyburd/redigo/redis/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/doc.go rename to vendor/github.com/garyburd/redigo/redis/doc.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/log.go b/vendor/github.com/garyburd/redigo/redis/log.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/log.go rename to vendor/github.com/garyburd/redigo/redis/log.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool.go b/vendor/github.com/garyburd/redigo/redis/pool.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool.go rename to vendor/github.com/garyburd/redigo/redis/pool.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pubsub.go b/vendor/github.com/garyburd/redigo/redis/pubsub.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/pubsub.go rename to vendor/github.com/garyburd/redigo/redis/pubsub.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/redis.go b/vendor/github.com/garyburd/redigo/redis/redis.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/redis.go rename to vendor/github.com/garyburd/redigo/redis/redis.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/reply.go b/vendor/github.com/garyburd/redigo/redis/reply.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/reply.go rename to vendor/github.com/garyburd/redigo/redis/reply.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/scan.go b/vendor/github.com/garyburd/redigo/redis/scan.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/scan.go rename to vendor/github.com/garyburd/redigo/redis/scan.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/script.go b/vendor/github.com/garyburd/redigo/redis/script.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/script.go rename to vendor/github.com/garyburd/redigo/redis/script.go diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/.gitignore b/vendor/github.com/go-ini/ini/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/go-ini/ini/.gitignore rename to vendor/github.com/go-ini/ini/.gitignore diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/LICENSE b/vendor/github.com/go-ini/ini/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/go-ini/ini/LICENSE rename to vendor/github.com/go-ini/ini/LICENSE diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/README.md b/vendor/github.com/go-ini/ini/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/go-ini/ini/README.md rename to vendor/github.com/go-ini/ini/README.md diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/README_ZH.md b/vendor/github.com/go-ini/ini/README_ZH.md similarity index 100% rename from Godeps/_workspace/src/github.com/go-ini/ini/README_ZH.md rename to vendor/github.com/go-ini/ini/README_ZH.md diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/ini.go b/vendor/github.com/go-ini/ini/ini.go similarity index 100% rename from Godeps/_workspace/src/github.com/go-ini/ini/ini.go rename to vendor/github.com/go-ini/ini/ini.go diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/parser.go b/vendor/github.com/go-ini/ini/parser.go similarity index 100% rename from Godeps/_workspace/src/github.com/go-ini/ini/parser.go rename to vendor/github.com/go-ini/ini/parser.go diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/struct.go b/vendor/github.com/go-ini/ini/struct.go similarity index 100% rename from Godeps/_workspace/src/github.com/go-ini/ini/struct.go rename to vendor/github.com/go-ini/ini/struct.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/CONTRIBUTING.md b/vendor/github.com/godbus/dbus/CONTRIBUTING.md similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/CONTRIBUTING.md rename to vendor/github.com/godbus/dbus/CONTRIBUTING.md diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/LICENSE b/vendor/github.com/godbus/dbus/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/LICENSE rename to vendor/github.com/godbus/dbus/LICENSE diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/MAINTAINERS b/vendor/github.com/godbus/dbus/MAINTAINERS similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/MAINTAINERS rename to vendor/github.com/godbus/dbus/MAINTAINERS diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/README.markdown b/vendor/github.com/godbus/dbus/README.markdown similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/README.markdown rename to vendor/github.com/godbus/dbus/README.markdown diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/auth.go b/vendor/github.com/godbus/dbus/auth.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/auth.go rename to vendor/github.com/godbus/dbus/auth.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/auth_external.go b/vendor/github.com/godbus/dbus/auth_external.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/auth_external.go rename to vendor/github.com/godbus/dbus/auth_external.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/auth_sha1.go b/vendor/github.com/godbus/dbus/auth_sha1.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/auth_sha1.go rename to vendor/github.com/godbus/dbus/auth_sha1.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/call.go b/vendor/github.com/godbus/dbus/call.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/call.go rename to vendor/github.com/godbus/dbus/call.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/conn.go b/vendor/github.com/godbus/dbus/conn.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/conn.go rename to vendor/github.com/godbus/dbus/conn.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/conn_darwin.go b/vendor/github.com/godbus/dbus/conn_darwin.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/conn_darwin.go rename to vendor/github.com/godbus/dbus/conn_darwin.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/conn_other.go b/vendor/github.com/godbus/dbus/conn_other.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/conn_other.go rename to vendor/github.com/godbus/dbus/conn_other.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/dbus.go b/vendor/github.com/godbus/dbus/dbus.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/dbus.go rename to vendor/github.com/godbus/dbus/dbus.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/decoder.go b/vendor/github.com/godbus/dbus/decoder.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/decoder.go rename to vendor/github.com/godbus/dbus/decoder.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/doc.go b/vendor/github.com/godbus/dbus/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/doc.go rename to vendor/github.com/godbus/dbus/doc.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/encoder.go b/vendor/github.com/godbus/dbus/encoder.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/encoder.go rename to vendor/github.com/godbus/dbus/encoder.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/export.go b/vendor/github.com/godbus/dbus/export.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/export.go rename to vendor/github.com/godbus/dbus/export.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/homedir.go b/vendor/github.com/godbus/dbus/homedir.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/homedir.go rename to vendor/github.com/godbus/dbus/homedir.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/homedir_dynamic.go b/vendor/github.com/godbus/dbus/homedir_dynamic.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/homedir_dynamic.go rename to vendor/github.com/godbus/dbus/homedir_dynamic.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/homedir_static.go b/vendor/github.com/godbus/dbus/homedir_static.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/homedir_static.go rename to vendor/github.com/godbus/dbus/homedir_static.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/message.go b/vendor/github.com/godbus/dbus/message.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/message.go rename to vendor/github.com/godbus/dbus/message.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/object.go b/vendor/github.com/godbus/dbus/object.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/object.go rename to vendor/github.com/godbus/dbus/object.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/sig.go b/vendor/github.com/godbus/dbus/sig.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/sig.go rename to vendor/github.com/godbus/dbus/sig.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/transport_darwin.go b/vendor/github.com/godbus/dbus/transport_darwin.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/transport_darwin.go rename to vendor/github.com/godbus/dbus/transport_darwin.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/transport_generic.go b/vendor/github.com/godbus/dbus/transport_generic.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/transport_generic.go rename to vendor/github.com/godbus/dbus/transport_generic.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/transport_unix.go b/vendor/github.com/godbus/dbus/transport_unix.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/transport_unix.go rename to vendor/github.com/godbus/dbus/transport_unix.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/transport_unixcred_dragonfly.go b/vendor/github.com/godbus/dbus/transport_unixcred_dragonfly.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/transport_unixcred_dragonfly.go rename to vendor/github.com/godbus/dbus/transport_unixcred_dragonfly.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/transport_unixcred_linux.go b/vendor/github.com/godbus/dbus/transport_unixcred_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/transport_unixcred_linux.go rename to vendor/github.com/godbus/dbus/transport_unixcred_linux.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/variant.go b/vendor/github.com/godbus/dbus/variant.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/variant.go rename to vendor/github.com/godbus/dbus/variant.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/variant_lexer.go b/vendor/github.com/godbus/dbus/variant_lexer.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/variant_lexer.go rename to vendor/github.com/godbus/dbus/variant_lexer.go diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/variant_parser.go b/vendor/github.com/godbus/dbus/variant_parser.go similarity index 100% rename from Godeps/_workspace/src/github.com/godbus/dbus/variant_parser.go rename to vendor/github.com/godbus/dbus/variant_parser.go diff --git a/Godeps/_workspace/src/github.com/golang/glog/LICENSE b/vendor/github.com/golang/glog/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/golang/glog/LICENSE rename to vendor/github.com/golang/glog/LICENSE diff --git a/Godeps/_workspace/src/github.com/golang/glog/README b/vendor/github.com/golang/glog/README similarity index 100% rename from Godeps/_workspace/src/github.com/golang/glog/README rename to vendor/github.com/golang/glog/README diff --git a/Godeps/_workspace/src/github.com/golang/glog/glog.go b/vendor/github.com/golang/glog/glog.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/glog/glog.go rename to vendor/github.com/golang/glog/glog.go diff --git a/Godeps/_workspace/src/github.com/golang/glog/glog_file.go b/vendor/github.com/golang/glog/glog_file.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/glog/glog_file.go rename to vendor/github.com/golang/glog/glog_file.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/LICENSE b/vendor/github.com/golang/protobuf/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/LICENSE rename to vendor/github.com/golang/protobuf/LICENSE diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/Makefile b/vendor/github.com/golang/protobuf/proto/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/Makefile rename to vendor/github.com/golang/protobuf/proto/Makefile diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/clone.go b/vendor/github.com/golang/protobuf/proto/clone.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/clone.go rename to vendor/github.com/golang/protobuf/proto/clone.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/decode.go b/vendor/github.com/golang/protobuf/proto/decode.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/decode.go rename to vendor/github.com/golang/protobuf/proto/decode.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/encode.go b/vendor/github.com/golang/protobuf/proto/encode.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/encode.go rename to vendor/github.com/golang/protobuf/proto/encode.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/equal.go b/vendor/github.com/golang/protobuf/proto/equal.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/equal.go rename to vendor/github.com/golang/protobuf/proto/equal.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions.go b/vendor/github.com/golang/protobuf/proto/extensions.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions.go rename to vendor/github.com/golang/protobuf/proto/extensions.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/lib.go b/vendor/github.com/golang/protobuf/proto/lib.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/lib.go rename to vendor/github.com/golang/protobuf/proto/lib.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/message_set.go b/vendor/github.com/golang/protobuf/proto/message_set.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/message_set.go rename to vendor/github.com/golang/protobuf/proto/message_set.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_reflect.go b/vendor/github.com/golang/protobuf/proto/pointer_reflect.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_reflect.go rename to vendor/github.com/golang/protobuf/proto/pointer_reflect.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_unsafe.go b/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_unsafe.go rename to vendor/github.com/golang/protobuf/proto/pointer_unsafe.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/properties.go b/vendor/github.com/golang/protobuf/proto/properties.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/properties.go rename to vendor/github.com/golang/protobuf/proto/properties.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text.go b/vendor/github.com/golang/protobuf/proto/text.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/text.go rename to vendor/github.com/golang/protobuf/proto/text.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser.go b/vendor/github.com/golang/protobuf/proto/text_parser.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser.go rename to vendor/github.com/golang/protobuf/proto/text_parser.go diff --git a/Godeps/_workspace/src/github.com/golang/snappy/AUTHORS b/vendor/github.com/golang/snappy/AUTHORS similarity index 100% rename from Godeps/_workspace/src/github.com/golang/snappy/AUTHORS rename to vendor/github.com/golang/snappy/AUTHORS diff --git a/Godeps/_workspace/src/github.com/golang/snappy/CONTRIBUTORS b/vendor/github.com/golang/snappy/CONTRIBUTORS similarity index 100% rename from Godeps/_workspace/src/github.com/golang/snappy/CONTRIBUTORS rename to vendor/github.com/golang/snappy/CONTRIBUTORS diff --git a/Godeps/_workspace/src/github.com/golang/snappy/LICENSE b/vendor/github.com/golang/snappy/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/golang/snappy/LICENSE rename to vendor/github.com/golang/snappy/LICENSE diff --git a/Godeps/_workspace/src/github.com/golang/snappy/README b/vendor/github.com/golang/snappy/README similarity index 100% rename from Godeps/_workspace/src/github.com/golang/snappy/README rename to vendor/github.com/golang/snappy/README diff --git a/Godeps/_workspace/src/github.com/golang/snappy/decode.go b/vendor/github.com/golang/snappy/decode.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/snappy/decode.go rename to vendor/github.com/golang/snappy/decode.go diff --git a/Godeps/_workspace/src/github.com/golang/snappy/encode.go b/vendor/github.com/golang/snappy/encode.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/snappy/encode.go rename to vendor/github.com/golang/snappy/encode.go diff --git a/Godeps/_workspace/src/github.com/golang/snappy/snappy.go b/vendor/github.com/golang/snappy/snappy.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/snappy/snappy.go rename to vendor/github.com/golang/snappy/snappy.go diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE b/vendor/github.com/influxdb/influxdb/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE rename to vendor/github.com/influxdb/influxdb/LICENSE diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE_OF_DEPENDENCIES.md b/vendor/github.com/influxdb/influxdb/LICENSE_OF_DEPENDENCIES.md similarity index 100% rename from Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE_OF_DEPENDENCIES.md rename to vendor/github.com/influxdb/influxdb/LICENSE_OF_DEPENDENCIES.md diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/README.md b/vendor/github.com/influxdb/influxdb/client/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/influxdb/influxdb/client/README.md rename to vendor/github.com/influxdb/influxdb/client/README.md diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/influxdb.go b/vendor/github.com/influxdb/influxdb/client/influxdb.go similarity index 100% rename from Godeps/_workspace/src/github.com/influxdb/influxdb/client/influxdb.go rename to vendor/github.com/influxdb/influxdb/client/influxdb.go diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/models/points.go b/vendor/github.com/influxdb/influxdb/models/points.go similarity index 100% rename from Godeps/_workspace/src/github.com/influxdb/influxdb/models/points.go rename to vendor/github.com/influxdb/influxdb/models/points.go diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/models/rows.go b/vendor/github.com/influxdb/influxdb/models/rows.go similarity index 100% rename from Godeps/_workspace/src/github.com/influxdb/influxdb/models/rows.go rename to vendor/github.com/influxdb/influxdb/models/rows.go diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/escape/bytes.go b/vendor/github.com/influxdb/influxdb/pkg/escape/bytes.go similarity index 100% rename from Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/escape/bytes.go rename to vendor/github.com/influxdb/influxdb/pkg/escape/bytes.go diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/escape/strings.go b/vendor/github.com/influxdb/influxdb/pkg/escape/strings.go similarity index 100% rename from Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/escape/strings.go rename to vendor/github.com/influxdb/influxdb/pkg/escape/strings.go diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/.gitignore b/vendor/github.com/jmespath/go-jmespath/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/.gitignore rename to vendor/github.com/jmespath/go-jmespath/.gitignore diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/.travis.yml b/vendor/github.com/jmespath/go-jmespath/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/.travis.yml rename to vendor/github.com/jmespath/go-jmespath/.travis.yml diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/LICENSE b/vendor/github.com/jmespath/go-jmespath/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/LICENSE rename to vendor/github.com/jmespath/go-jmespath/LICENSE diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/Makefile b/vendor/github.com/jmespath/go-jmespath/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/Makefile rename to vendor/github.com/jmespath/go-jmespath/Makefile diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/README.md b/vendor/github.com/jmespath/go-jmespath/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/README.md rename to vendor/github.com/jmespath/go-jmespath/README.md diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/api.go b/vendor/github.com/jmespath/go-jmespath/api.go similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/api.go rename to vendor/github.com/jmespath/go-jmespath/api.go diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/astnodetype_string.go b/vendor/github.com/jmespath/go-jmespath/astnodetype_string.go similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/astnodetype_string.go rename to vendor/github.com/jmespath/go-jmespath/astnodetype_string.go diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/functions.go b/vendor/github.com/jmespath/go-jmespath/functions.go similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/functions.go rename to vendor/github.com/jmespath/go-jmespath/functions.go diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/interpreter.go b/vendor/github.com/jmespath/go-jmespath/interpreter.go similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/interpreter.go rename to vendor/github.com/jmespath/go-jmespath/interpreter.go diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/lexer.go b/vendor/github.com/jmespath/go-jmespath/lexer.go similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/lexer.go rename to vendor/github.com/jmespath/go-jmespath/lexer.go diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/parser.go b/vendor/github.com/jmespath/go-jmespath/parser.go similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/parser.go rename to vendor/github.com/jmespath/go-jmespath/parser.go diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/toktype_string.go b/vendor/github.com/jmespath/go-jmespath/toktype_string.go similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/toktype_string.go rename to vendor/github.com/jmespath/go-jmespath/toktype_string.go diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/util.go b/vendor/github.com/jmespath/go-jmespath/util.go similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/util.go rename to vendor/github.com/jmespath/go-jmespath/util.go diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/.gitignore b/vendor/github.com/klauspost/crc32/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/klauspost/crc32/.gitignore rename to vendor/github.com/klauspost/crc32/.gitignore diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/.travis.yml b/vendor/github.com/klauspost/crc32/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/klauspost/crc32/.travis.yml rename to vendor/github.com/klauspost/crc32/.travis.yml diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/LICENSE b/vendor/github.com/klauspost/crc32/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/klauspost/crc32/LICENSE rename to vendor/github.com/klauspost/crc32/LICENSE diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/README.md b/vendor/github.com/klauspost/crc32/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/klauspost/crc32/README.md rename to vendor/github.com/klauspost/crc32/README.md diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32.go b/vendor/github.com/klauspost/crc32/crc32.go similarity index 100% rename from Godeps/_workspace/src/github.com/klauspost/crc32/crc32.go rename to vendor/github.com/klauspost/crc32/crc32.go diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64.go b/vendor/github.com/klauspost/crc32/crc32_amd64.go similarity index 100% rename from Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64.go rename to vendor/github.com/klauspost/crc32/crc32_amd64.go diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64.s b/vendor/github.com/klauspost/crc32/crc32_amd64.s similarity index 100% rename from Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64.s rename to vendor/github.com/klauspost/crc32/crc32_amd64.s diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64p32.go b/vendor/github.com/klauspost/crc32/crc32_amd64p32.go similarity index 100% rename from Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64p32.go rename to vendor/github.com/klauspost/crc32/crc32_amd64p32.go diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64p32.s b/vendor/github.com/klauspost/crc32/crc32_amd64p32.s similarity index 100% rename from Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64p32.s rename to vendor/github.com/klauspost/crc32/crc32_amd64p32.s diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_generic.go b/vendor/github.com/klauspost/crc32/crc32_generic.go similarity index 100% rename from Godeps/_workspace/src/github.com/klauspost/crc32/crc32_generic.go rename to vendor/github.com/klauspost/crc32/crc32_generic.go diff --git a/Godeps/_workspace/src/github.com/kr/pretty/.gitignore b/vendor/github.com/kr/pretty/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/kr/pretty/.gitignore rename to vendor/github.com/kr/pretty/.gitignore diff --git a/Godeps/_workspace/src/github.com/kr/pretty/License b/vendor/github.com/kr/pretty/License similarity index 100% rename from Godeps/_workspace/src/github.com/kr/pretty/License rename to vendor/github.com/kr/pretty/License diff --git a/Godeps/_workspace/src/github.com/kr/pretty/Readme b/vendor/github.com/kr/pretty/Readme similarity index 100% rename from Godeps/_workspace/src/github.com/kr/pretty/Readme rename to vendor/github.com/kr/pretty/Readme diff --git a/Godeps/_workspace/src/github.com/kr/pretty/diff.go b/vendor/github.com/kr/pretty/diff.go similarity index 100% rename from Godeps/_workspace/src/github.com/kr/pretty/diff.go rename to vendor/github.com/kr/pretty/diff.go diff --git a/Godeps/_workspace/src/github.com/kr/pretty/formatter.go b/vendor/github.com/kr/pretty/formatter.go similarity index 100% rename from Godeps/_workspace/src/github.com/kr/pretty/formatter.go rename to vendor/github.com/kr/pretty/formatter.go diff --git a/Godeps/_workspace/src/github.com/kr/pretty/pretty.go b/vendor/github.com/kr/pretty/pretty.go similarity index 100% rename from Godeps/_workspace/src/github.com/kr/pretty/pretty.go rename to vendor/github.com/kr/pretty/pretty.go diff --git a/Godeps/_workspace/src/github.com/kr/pretty/zero.go b/vendor/github.com/kr/pretty/zero.go similarity index 100% rename from Godeps/_workspace/src/github.com/kr/pretty/zero.go rename to vendor/github.com/kr/pretty/zero.go diff --git a/Godeps/_workspace/src/github.com/kr/text/License b/vendor/github.com/kr/text/License similarity index 100% rename from Godeps/_workspace/src/github.com/kr/text/License rename to vendor/github.com/kr/text/License diff --git a/Godeps/_workspace/src/github.com/kr/text/Readme b/vendor/github.com/kr/text/Readme similarity index 100% rename from Godeps/_workspace/src/github.com/kr/text/Readme rename to vendor/github.com/kr/text/Readme diff --git a/Godeps/_workspace/src/github.com/kr/text/doc.go b/vendor/github.com/kr/text/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/kr/text/doc.go rename to vendor/github.com/kr/text/doc.go diff --git a/Godeps/_workspace/src/github.com/kr/text/indent.go b/vendor/github.com/kr/text/indent.go similarity index 100% rename from Godeps/_workspace/src/github.com/kr/text/indent.go rename to vendor/github.com/kr/text/indent.go diff --git a/Godeps/_workspace/src/github.com/kr/text/wrap.go b/vendor/github.com/kr/text/wrap.go old mode 100644 new mode 100755 similarity index 97% rename from Godeps/_workspace/src/github.com/kr/text/wrap.go rename to vendor/github.com/kr/text/wrap.go index ca885651..1c85cd2c --- a/Godeps/_workspace/src/github.com/kr/text/wrap.go +++ b/vendor/github.com/kr/text/wrap.go @@ -31,7 +31,7 @@ func WrapBytes(b []byte, lim int) []byte { // WrapWords is the low-level line-breaking algorithm, useful if you need more // control over the details of the text wrapping process. For most uses, either -// Wrap or WrapBytes will be sufficient and more convenient. +// Wrap or WrapBytes will be sufficient and more convenient. // // WrapWords splits a list of words into lines with minimal "raggedness", // treating each byte as one unit, accounting for spc units between adjacent diff --git a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/LICENSE b/vendor/github.com/matttproud/golang_protobuf_extensions/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/LICENSE rename to vendor/github.com/matttproud/golang_protobuf_extensions/LICENSE diff --git a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/decode.go b/vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/decode.go similarity index 100% rename from Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/decode.go rename to vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/decode.go diff --git a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/doc.go b/vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/doc.go rename to vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/doc.go diff --git a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/encode.go b/vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/encode.go similarity index 100% rename from Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/encode.go rename to vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/encode.go diff --git a/Godeps/_workspace/src/github.com/mistifyio/go-zfs/.gitignore b/vendor/github.com/mistifyio/go-zfs/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/mistifyio/go-zfs/.gitignore rename to vendor/github.com/mistifyio/go-zfs/.gitignore diff --git a/Godeps/_workspace/src/github.com/mistifyio/go-zfs/CONTRIBUTING.md b/vendor/github.com/mistifyio/go-zfs/CONTRIBUTING.md similarity index 100% rename from Godeps/_workspace/src/github.com/mistifyio/go-zfs/CONTRIBUTING.md rename to vendor/github.com/mistifyio/go-zfs/CONTRIBUTING.md diff --git a/Godeps/_workspace/src/github.com/mistifyio/go-zfs/LICENSE b/vendor/github.com/mistifyio/go-zfs/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/mistifyio/go-zfs/LICENSE rename to vendor/github.com/mistifyio/go-zfs/LICENSE diff --git a/Godeps/_workspace/src/github.com/mistifyio/go-zfs/README.md b/vendor/github.com/mistifyio/go-zfs/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/mistifyio/go-zfs/README.md rename to vendor/github.com/mistifyio/go-zfs/README.md diff --git a/Godeps/_workspace/src/github.com/mistifyio/go-zfs/Vagrantfile b/vendor/github.com/mistifyio/go-zfs/Vagrantfile similarity index 100% rename from Godeps/_workspace/src/github.com/mistifyio/go-zfs/Vagrantfile rename to vendor/github.com/mistifyio/go-zfs/Vagrantfile diff --git a/Godeps/_workspace/src/github.com/mistifyio/go-zfs/error.go b/vendor/github.com/mistifyio/go-zfs/error.go similarity index 100% rename from Godeps/_workspace/src/github.com/mistifyio/go-zfs/error.go rename to vendor/github.com/mistifyio/go-zfs/error.go diff --git a/Godeps/_workspace/src/github.com/mistifyio/go-zfs/utils.go b/vendor/github.com/mistifyio/go-zfs/utils.go similarity index 100% rename from Godeps/_workspace/src/github.com/mistifyio/go-zfs/utils.go rename to vendor/github.com/mistifyio/go-zfs/utils.go diff --git a/Godeps/_workspace/src/github.com/mistifyio/go-zfs/zfs.go b/vendor/github.com/mistifyio/go-zfs/zfs.go similarity index 100% rename from Godeps/_workspace/src/github.com/mistifyio/go-zfs/zfs.go rename to vendor/github.com/mistifyio/go-zfs/zfs.go diff --git a/Godeps/_workspace/src/github.com/mistifyio/go-zfs/zpool.go b/vendor/github.com/mistifyio/go-zfs/zpool.go similarity index 100% rename from Godeps/_workspace/src/github.com/mistifyio/go-zfs/zpool.go rename to vendor/github.com/mistifyio/go-zfs/zpool.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/LICENSE b/vendor/github.com/opencontainers/runc/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/LICENSE rename to vendor/github.com/opencontainers/runc/LICENSE diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/NOTICE b/vendor/github.com/opencontainers/runc/NOTICE similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/NOTICE rename to vendor/github.com/opencontainers/runc/NOTICE diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/README.md b/vendor/github.com/opencontainers/runc/libcontainer/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/README.md rename to vendor/github.com/opencontainers/runc/libcontainer/README.md diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/SPEC.md b/vendor/github.com/opencontainers/runc/libcontainer/SPEC.md similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/SPEC.md rename to vendor/github.com/opencontainers/runc/libcontainer/SPEC.md diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/apparmor/apparmor.go b/vendor/github.com/opencontainers/runc/libcontainer/apparmor/apparmor.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/apparmor/apparmor.go rename to vendor/github.com/opencontainers/runc/libcontainer/apparmor/apparmor.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/apparmor/apparmor_disabled.go b/vendor/github.com/opencontainers/runc/libcontainer/apparmor/apparmor_disabled.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/apparmor/apparmor_disabled.go rename to vendor/github.com/opencontainers/runc/libcontainer/apparmor/apparmor_disabled.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/capabilities_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/capabilities_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/capabilities_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/capabilities_linux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/cgroups.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/cgroups.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/cgroups.go rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/cgroups.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/cgroups_unsupported.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/cgroups_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/cgroups_unsupported.go rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/cgroups_unsupported.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/apply_raw.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/apply_raw.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/apply_raw.go rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/apply_raw.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/blkio.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/blkio.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/blkio.go rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/blkio.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpu.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpu.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpu.go rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpu.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpuacct.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpuacct.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpuacct.go rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpuacct.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpuset.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpuset.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpuset.go rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpuset.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/devices.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/devices.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/devices.go rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/devices.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/freezer.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/freezer.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/freezer.go rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/freezer.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/fs_unsupported.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/fs_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/fs_unsupported.go rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/fs_unsupported.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/hugetlb.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/hugetlb.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/hugetlb.go rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/hugetlb.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/memory.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/memory.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/memory.go rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/memory.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/name.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/name.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/name.go rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/name.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/net_cls.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/net_cls.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/net_cls.go rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/net_cls.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/net_prio.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/net_prio.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/net_prio.go rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/net_prio.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/perf_event.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/perf_event.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/perf_event.go rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/perf_event.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/pids.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/pids.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/pids.go rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/pids.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/utils.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/utils.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/utils.go rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/utils.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/stats.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/stats.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/stats.go rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/stats.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_nosystemd.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_nosystemd.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_nosystemd.go rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_nosystemd.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_systemd.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_systemd.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_systemd.go rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_systemd.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/utils.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/utils.go rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/compat_1.5_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/compat_1.5_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/compat_1.5_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/compat_1.5_linux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/blkio_device.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/blkio_device.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/blkio_device.go rename to vendor/github.com/opencontainers/runc/libcontainer/configs/blkio_device.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/cgroup_unix.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_unix.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/cgroup_unix.go rename to vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_unix.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/cgroup_unsupported.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/cgroup_unsupported.go rename to vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_unsupported.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/cgroup_windows.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/cgroup_windows.go rename to vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_windows.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/config.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/config.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/config.go rename to vendor/github.com/opencontainers/runc/libcontainer/configs/config.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/config_unix.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/config_unix.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/config_unix.go rename to vendor/github.com/opencontainers/runc/libcontainer/configs/config_unix.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/device.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/device.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/device.go rename to vendor/github.com/opencontainers/runc/libcontainer/configs/device.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/device_defaults.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/device_defaults.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/device_defaults.go rename to vendor/github.com/opencontainers/runc/libcontainer/configs/device_defaults.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/hugepage_limit.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/hugepage_limit.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/hugepage_limit.go rename to vendor/github.com/opencontainers/runc/libcontainer/configs/hugepage_limit.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/interface_priority_map.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/interface_priority_map.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/interface_priority_map.go rename to vendor/github.com/opencontainers/runc/libcontainer/configs/interface_priority_map.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/mount.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/mount.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/mount.go rename to vendor/github.com/opencontainers/runc/libcontainer/configs/mount.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/namespaces.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/namespaces.go rename to vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/namespaces_syscall.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces_syscall.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/namespaces_syscall.go rename to vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces_syscall.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/namespaces_syscall_unsupported.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces_syscall_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/namespaces_syscall_unsupported.go rename to vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces_syscall_unsupported.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/namespaces_unix.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces_unix.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/namespaces_unix.go rename to vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces_unix.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/namespaces_unsupported.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/namespaces_unsupported.go rename to vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces_unsupported.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/network.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/network.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/network.go rename to vendor/github.com/opencontainers/runc/libcontainer/configs/network.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/validate/config.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/validate/config.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/validate/config.go rename to vendor/github.com/opencontainers/runc/libcontainer/configs/validate/config.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/console.go b/vendor/github.com/opencontainers/runc/libcontainer/console.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/console.go rename to vendor/github.com/opencontainers/runc/libcontainer/console.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/console_freebsd.go b/vendor/github.com/opencontainers/runc/libcontainer/console_freebsd.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/console_freebsd.go rename to vendor/github.com/opencontainers/runc/libcontainer/console_freebsd.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/console_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/console_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/console_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/console_linux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/console_windows.go b/vendor/github.com/opencontainers/runc/libcontainer/console_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/console_windows.go rename to vendor/github.com/opencontainers/runc/libcontainer/console_windows.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/container.go b/vendor/github.com/opencontainers/runc/libcontainer/container.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/container.go rename to vendor/github.com/opencontainers/runc/libcontainer/container.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/container_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/container_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/container_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/container_linux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/container_nouserns_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/container_nouserns_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/container_nouserns_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/container_nouserns_linux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/container_userns_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/container_userns_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/container_userns_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/container_userns_linux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/container_windows.go b/vendor/github.com/opencontainers/runc/libcontainer/container_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/container_windows.go rename to vendor/github.com/opencontainers/runc/libcontainer/container_windows.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/criu_opts_unix.go b/vendor/github.com/opencontainers/runc/libcontainer/criu_opts_unix.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/criu_opts_unix.go rename to vendor/github.com/opencontainers/runc/libcontainer/criu_opts_unix.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/criu_opts_windows.go b/vendor/github.com/opencontainers/runc/libcontainer/criu_opts_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/criu_opts_windows.go rename to vendor/github.com/opencontainers/runc/libcontainer/criu_opts_windows.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/criurpc/Makefile b/vendor/github.com/opencontainers/runc/libcontainer/criurpc/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/criurpc/Makefile rename to vendor/github.com/opencontainers/runc/libcontainer/criurpc/Makefile diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/criurpc/criurpc.pb.go b/vendor/github.com/opencontainers/runc/libcontainer/criurpc/criurpc.pb.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/criurpc/criurpc.pb.go rename to vendor/github.com/opencontainers/runc/libcontainer/criurpc/criurpc.pb.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/criurpc/criurpc.proto b/vendor/github.com/opencontainers/runc/libcontainer/criurpc/criurpc.proto similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/criurpc/criurpc.proto rename to vendor/github.com/opencontainers/runc/libcontainer/criurpc/criurpc.proto diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/error.go b/vendor/github.com/opencontainers/runc/libcontainer/error.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/error.go rename to vendor/github.com/opencontainers/runc/libcontainer/error.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/factory.go b/vendor/github.com/opencontainers/runc/libcontainer/factory.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/factory.go rename to vendor/github.com/opencontainers/runc/libcontainer/factory.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/factory_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/factory_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/factory_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/factory_linux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/generic_error.go b/vendor/github.com/opencontainers/runc/libcontainer/generic_error.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/generic_error.go rename to vendor/github.com/opencontainers/runc/libcontainer/generic_error.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/init_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/init_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/init_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/init_linux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/label/label.go b/vendor/github.com/opencontainers/runc/libcontainer/label/label.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/label/label.go rename to vendor/github.com/opencontainers/runc/libcontainer/label/label.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/label/label_selinux.go b/vendor/github.com/opencontainers/runc/libcontainer/label/label_selinux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/label/label_selinux.go rename to vendor/github.com/opencontainers/runc/libcontainer/label/label_selinux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/message_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/message_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/message_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/message_linux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/network_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/network_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/network_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/network_linux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/notify_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/notify_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/notify_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/notify_linux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/process.go b/vendor/github.com/opencontainers/runc/libcontainer/process.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/process.go rename to vendor/github.com/opencontainers/runc/libcontainer/process.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/process_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/process_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/process_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/process_linux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/restored_process.go b/vendor/github.com/opencontainers/runc/libcontainer/restored_process.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/restored_process.go rename to vendor/github.com/opencontainers/runc/libcontainer/restored_process.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/rootfs_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/rootfs_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/rootfs_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/rootfs_linux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/seccomp/config.go b/vendor/github.com/opencontainers/runc/libcontainer/seccomp/config.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/seccomp/config.go rename to vendor/github.com/opencontainers/runc/libcontainer/seccomp/config.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/seccomp/seccomp_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/seccomp/seccomp_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/seccomp/seccomp_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/seccomp/seccomp_linux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/seccomp/seccomp_unsupported.go b/vendor/github.com/opencontainers/runc/libcontainer/seccomp/seccomp_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/seccomp/seccomp_unsupported.go rename to vendor/github.com/opencontainers/runc/libcontainer/seccomp/seccomp_unsupported.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/selinux/selinux.go b/vendor/github.com/opencontainers/runc/libcontainer/selinux/selinux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/selinux/selinux.go rename to vendor/github.com/opencontainers/runc/libcontainer/selinux/selinux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/setgroups_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/setgroups_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/setgroups_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/setgroups_linux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/setns_init_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/setns_init_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/setns_init_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/setns_init_linux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stacktrace/capture.go b/vendor/github.com/opencontainers/runc/libcontainer/stacktrace/capture.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stacktrace/capture.go rename to vendor/github.com/opencontainers/runc/libcontainer/stacktrace/capture.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stacktrace/frame.go b/vendor/github.com/opencontainers/runc/libcontainer/stacktrace/frame.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stacktrace/frame.go rename to vendor/github.com/opencontainers/runc/libcontainer/stacktrace/frame.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stacktrace/stacktrace.go b/vendor/github.com/opencontainers/runc/libcontainer/stacktrace/stacktrace.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stacktrace/stacktrace.go rename to vendor/github.com/opencontainers/runc/libcontainer/stacktrace/stacktrace.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/standard_init_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/standard_init_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/standard_init_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/standard_init_linux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/state_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/state_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/state_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/state_linux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stats.go b/vendor/github.com/opencontainers/runc/libcontainer/stats.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stats.go rename to vendor/github.com/opencontainers/runc/libcontainer/stats.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stats_freebsd.go b/vendor/github.com/opencontainers/runc/libcontainer/stats_freebsd.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stats_freebsd.go rename to vendor/github.com/opencontainers/runc/libcontainer/stats_freebsd.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stats_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/stats_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stats_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/stats_linux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stats_windows.go b/vendor/github.com/opencontainers/runc/libcontainer/stats_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stats_windows.go rename to vendor/github.com/opencontainers/runc/libcontainer/stats_windows.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/linux.go b/vendor/github.com/opencontainers/runc/libcontainer/system/linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/system/linux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/proc.go b/vendor/github.com/opencontainers/runc/libcontainer/system/proc.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/proc.go rename to vendor/github.com/opencontainers/runc/libcontainer/system/proc.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/setns_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/system/setns_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/setns_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/system/setns_linux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_386.go b/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_386.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_386.go rename to vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_386.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go b/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go rename to vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_arm.go b/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_arm.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_arm.go rename to vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_arm.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/sysconfig.go b/vendor/github.com/opencontainers/runc/libcontainer/system/sysconfig.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/sysconfig.go rename to vendor/github.com/opencontainers/runc/libcontainer/system/sysconfig.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/sysconfig_notcgo.go b/vendor/github.com/opencontainers/runc/libcontainer/system/sysconfig_notcgo.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/sysconfig_notcgo.go rename to vendor/github.com/opencontainers/runc/libcontainer/system/sysconfig_notcgo.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/xattrs_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/system/xattrs_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/xattrs_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/system/xattrs_linux.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS b/vendor/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS rename to vendor/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/lookup.go b/vendor/github.com/opencontainers/runc/libcontainer/user/lookup.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/lookup.go rename to vendor/github.com/opencontainers/runc/libcontainer/user/lookup.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go b/vendor/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go rename to vendor/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go b/vendor/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go rename to vendor/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/user.go b/vendor/github.com/opencontainers/runc/libcontainer/user/user.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/user.go rename to vendor/github.com/opencontainers/runc/libcontainer/user/user.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/utils/utils.go b/vendor/github.com/opencontainers/runc/libcontainer/utils/utils.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/utils/utils.go rename to vendor/github.com/opencontainers/runc/libcontainer/utils/utils.go diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go b/vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go similarity index 100% rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go rename to vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/CONTRIBUTORS b/vendor/github.com/pborman/uuid/CONTRIBUTORS similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/CONTRIBUTORS rename to vendor/github.com/pborman/uuid/CONTRIBUTORS diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/LICENSE b/vendor/github.com/pborman/uuid/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/LICENSE rename to vendor/github.com/pborman/uuid/LICENSE diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/dce.go b/vendor/github.com/pborman/uuid/dce.go old mode 100644 new mode 100755 similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/dce.go rename to vendor/github.com/pborman/uuid/dce.go diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/doc.go b/vendor/github.com/pborman/uuid/doc.go old mode 100644 new mode 100755 similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/doc.go rename to vendor/github.com/pborman/uuid/doc.go diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/hash.go b/vendor/github.com/pborman/uuid/hash.go similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/hash.go rename to vendor/github.com/pborman/uuid/hash.go diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/json.go b/vendor/github.com/pborman/uuid/json.go similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/json.go rename to vendor/github.com/pborman/uuid/json.go diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/node.go b/vendor/github.com/pborman/uuid/node.go old mode 100644 new mode 100755 similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/node.go rename to vendor/github.com/pborman/uuid/node.go diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/sql.go b/vendor/github.com/pborman/uuid/sql.go similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/sql.go rename to vendor/github.com/pborman/uuid/sql.go diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/time.go b/vendor/github.com/pborman/uuid/time.go old mode 100644 new mode 100755 similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/time.go rename to vendor/github.com/pborman/uuid/time.go diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/util.go b/vendor/github.com/pborman/uuid/util.go similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/util.go rename to vendor/github.com/pborman/uuid/util.go diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/uuid.go b/vendor/github.com/pborman/uuid/uuid.go old mode 100644 new mode 100755 similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/uuid.go rename to vendor/github.com/pborman/uuid/uuid.go diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/version1.go b/vendor/github.com/pborman/uuid/version1.go similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/version1.go rename to vendor/github.com/pborman/uuid/version1.go diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/version4.go b/vendor/github.com/pborman/uuid/version4.go similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/version4.go rename to vendor/github.com/pborman/uuid/version4.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/LICENSE b/vendor/github.com/prometheus/client_golang/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/LICENSE rename to vendor/github.com/prometheus/client_golang/LICENSE diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/NOTICE b/vendor/github.com/prometheus/client_golang/NOTICE similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/NOTICE rename to vendor/github.com/prometheus/client_golang/NOTICE diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/.gitignore b/vendor/github.com/prometheus/client_golang/prometheus/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/.gitignore rename to vendor/github.com/prometheus/client_golang/prometheus/.gitignore diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/README.md b/vendor/github.com/prometheus/client_golang/prometheus/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/README.md rename to vendor/github.com/prometheus/client_golang/prometheus/README.md diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/collector.go b/vendor/github.com/prometheus/client_golang/prometheus/collector.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/collector.go rename to vendor/github.com/prometheus/client_golang/prometheus/collector.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/counter.go b/vendor/github.com/prometheus/client_golang/prometheus/counter.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/counter.go rename to vendor/github.com/prometheus/client_golang/prometheus/counter.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/desc.go b/vendor/github.com/prometheus/client_golang/prometheus/desc.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/desc.go rename to vendor/github.com/prometheus/client_golang/prometheus/desc.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/doc.go b/vendor/github.com/prometheus/client_golang/prometheus/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/doc.go rename to vendor/github.com/prometheus/client_golang/prometheus/doc.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/expvar.go b/vendor/github.com/prometheus/client_golang/prometheus/expvar.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/expvar.go rename to vendor/github.com/prometheus/client_golang/prometheus/expvar.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/gauge.go b/vendor/github.com/prometheus/client_golang/prometheus/gauge.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/gauge.go rename to vendor/github.com/prometheus/client_golang/prometheus/gauge.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/go_collector.go b/vendor/github.com/prometheus/client_golang/prometheus/go_collector.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/go_collector.go rename to vendor/github.com/prometheus/client_golang/prometheus/go_collector.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/histogram.go b/vendor/github.com/prometheus/client_golang/prometheus/histogram.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/histogram.go rename to vendor/github.com/prometheus/client_golang/prometheus/histogram.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/http.go b/vendor/github.com/prometheus/client_golang/prometheus/http.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/http.go rename to vendor/github.com/prometheus/client_golang/prometheus/http.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/metric.go b/vendor/github.com/prometheus/client_golang/prometheus/metric.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/metric.go rename to vendor/github.com/prometheus/client_golang/prometheus/metric.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/process_collector.go b/vendor/github.com/prometheus/client_golang/prometheus/process_collector.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/process_collector.go rename to vendor/github.com/prometheus/client_golang/prometheus/process_collector.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/push.go b/vendor/github.com/prometheus/client_golang/prometheus/push.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/push.go rename to vendor/github.com/prometheus/client_golang/prometheus/push.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/registry.go b/vendor/github.com/prometheus/client_golang/prometheus/registry.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/registry.go rename to vendor/github.com/prometheus/client_golang/prometheus/registry.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/summary.go b/vendor/github.com/prometheus/client_golang/prometheus/summary.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/summary.go rename to vendor/github.com/prometheus/client_golang/prometheus/summary.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/untyped.go b/vendor/github.com/prometheus/client_golang/prometheus/untyped.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/untyped.go rename to vendor/github.com/prometheus/client_golang/prometheus/untyped.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/value.go b/vendor/github.com/prometheus/client_golang/prometheus/value.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/value.go rename to vendor/github.com/prometheus/client_golang/prometheus/value.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/vec.go b/vendor/github.com/prometheus/client_golang/prometheus/vec.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/vec.go rename to vendor/github.com/prometheus/client_golang/prometheus/vec.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_model/LICENSE b/vendor/github.com/prometheus/client_model/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_model/LICENSE rename to vendor/github.com/prometheus/client_model/LICENSE diff --git a/Godeps/_workspace/src/github.com/prometheus/client_model/NOTICE b/vendor/github.com/prometheus/client_model/NOTICE similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_model/NOTICE rename to vendor/github.com/prometheus/client_model/NOTICE diff --git a/Godeps/_workspace/src/github.com/prometheus/client_model/go/metrics.pb.go b/vendor/github.com/prometheus/client_model/go/metrics.pb.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_model/go/metrics.pb.go rename to vendor/github.com/prometheus/client_model/go/metrics.pb.go diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/decode.go b/vendor/github.com/prometheus/common/expfmt/decode.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/decode.go rename to vendor/github.com/prometheus/common/expfmt/decode.go diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/encode.go b/vendor/github.com/prometheus/common/expfmt/encode.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/encode.go rename to vendor/github.com/prometheus/common/expfmt/encode.go diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/expfmt.go b/vendor/github.com/prometheus/common/expfmt/expfmt.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/expfmt.go rename to vendor/github.com/prometheus/common/expfmt/expfmt.go diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz.go b/vendor/github.com/prometheus/common/expfmt/fuzz.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz.go rename to vendor/github.com/prometheus/common/expfmt/fuzz.go diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/json_decode.go b/vendor/github.com/prometheus/common/expfmt/json_decode.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/json_decode.go rename to vendor/github.com/prometheus/common/expfmt/json_decode.go diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/text_create.go b/vendor/github.com/prometheus/common/expfmt/text_create.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/text_create.go rename to vendor/github.com/prometheus/common/expfmt/text_create.go diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/text_parse.go b/vendor/github.com/prometheus/common/expfmt/text_parse.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/text_parse.go rename to vendor/github.com/prometheus/common/expfmt/text_parse.go diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/alert.go b/vendor/github.com/prometheus/common/model/alert.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/common/model/alert.go rename to vendor/github.com/prometheus/common/model/alert.go diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/fingerprinting.go b/vendor/github.com/prometheus/common/model/fingerprinting.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/common/model/fingerprinting.go rename to vendor/github.com/prometheus/common/model/fingerprinting.go diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/labels.go b/vendor/github.com/prometheus/common/model/labels.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/common/model/labels.go rename to vendor/github.com/prometheus/common/model/labels.go diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/labelset.go b/vendor/github.com/prometheus/common/model/labelset.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/common/model/labelset.go rename to vendor/github.com/prometheus/common/model/labelset.go diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/metric.go b/vendor/github.com/prometheus/common/model/metric.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/common/model/metric.go rename to vendor/github.com/prometheus/common/model/metric.go diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/model.go b/vendor/github.com/prometheus/common/model/model.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/common/model/model.go rename to vendor/github.com/prometheus/common/model/model.go diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/signature.go b/vendor/github.com/prometheus/common/model/signature.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/common/model/signature.go rename to vendor/github.com/prometheus/common/model/signature.go diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/silence.go b/vendor/github.com/prometheus/common/model/silence.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/common/model/silence.go rename to vendor/github.com/prometheus/common/model/silence.go diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/time.go b/vendor/github.com/prometheus/common/model/time.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/common/model/time.go rename to vendor/github.com/prometheus/common/model/time.go diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/value.go b/vendor/github.com/prometheus/common/model/value.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/common/model/value.go rename to vendor/github.com/prometheus/common/model/value.go diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/AUTHORS.md b/vendor/github.com/prometheus/procfs/AUTHORS.md similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/procfs/AUTHORS.md rename to vendor/github.com/prometheus/procfs/AUTHORS.md diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/CONTRIBUTING.md b/vendor/github.com/prometheus/procfs/CONTRIBUTING.md similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/procfs/CONTRIBUTING.md rename to vendor/github.com/prometheus/procfs/CONTRIBUTING.md diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/LICENSE b/vendor/github.com/prometheus/procfs/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/procfs/LICENSE rename to vendor/github.com/prometheus/procfs/LICENSE diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/NOTICE b/vendor/github.com/prometheus/procfs/NOTICE similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/procfs/NOTICE rename to vendor/github.com/prometheus/procfs/NOTICE diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/README.md b/vendor/github.com/prometheus/procfs/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/procfs/README.md rename to vendor/github.com/prometheus/procfs/README.md diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/doc.go b/vendor/github.com/prometheus/procfs/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/procfs/doc.go rename to vendor/github.com/prometheus/procfs/doc.go diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fs.go b/vendor/github.com/prometheus/procfs/fs.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/procfs/fs.go rename to vendor/github.com/prometheus/procfs/fs.go diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/proc.go b/vendor/github.com/prometheus/procfs/proc.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/procfs/proc.go rename to vendor/github.com/prometheus/procfs/proc.go diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/proc_limits.go b/vendor/github.com/prometheus/procfs/proc_limits.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/procfs/proc_limits.go rename to vendor/github.com/prometheus/procfs/proc_limits.go diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/proc_stat.go b/vendor/github.com/prometheus/procfs/proc_stat.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/procfs/proc_stat.go rename to vendor/github.com/prometheus/procfs/proc_stat.go diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/stat.go b/vendor/github.com/prometheus/procfs/stat.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/procfs/stat.go rename to vendor/github.com/prometheus/procfs/stat.go diff --git a/Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/LICENSE b/vendor/github.com/seccomp/libseccomp-golang/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/LICENSE rename to vendor/github.com/seccomp/libseccomp-golang/LICENSE diff --git a/Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/README b/vendor/github.com/seccomp/libseccomp-golang/README similarity index 100% rename from Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/README rename to vendor/github.com/seccomp/libseccomp-golang/README diff --git a/Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/seccomp.go b/vendor/github.com/seccomp/libseccomp-golang/seccomp.go similarity index 100% rename from Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/seccomp.go rename to vendor/github.com/seccomp/libseccomp-golang/seccomp.go diff --git a/Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/seccomp_internal.go b/vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go similarity index 100% rename from Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/seccomp_internal.go rename to vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/.gitignore b/vendor/github.com/stretchr/objx/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/objx/.gitignore rename to vendor/github.com/stretchr/objx/.gitignore diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/LICENSE.md b/vendor/github.com/stretchr/objx/LICENSE.md similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/objx/LICENSE.md rename to vendor/github.com/stretchr/objx/LICENSE.md diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/README.md b/vendor/github.com/stretchr/objx/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/objx/README.md rename to vendor/github.com/stretchr/objx/README.md diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/accessors.go b/vendor/github.com/stretchr/objx/accessors.go similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/objx/accessors.go rename to vendor/github.com/stretchr/objx/accessors.go diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/constants.go b/vendor/github.com/stretchr/objx/constants.go similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/objx/constants.go rename to vendor/github.com/stretchr/objx/constants.go diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/conversions.go b/vendor/github.com/stretchr/objx/conversions.go similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/objx/conversions.go rename to vendor/github.com/stretchr/objx/conversions.go diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/doc.go b/vendor/github.com/stretchr/objx/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/objx/doc.go rename to vendor/github.com/stretchr/objx/doc.go diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/map.go b/vendor/github.com/stretchr/objx/map.go similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/objx/map.go rename to vendor/github.com/stretchr/objx/map.go diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/mutations.go b/vendor/github.com/stretchr/objx/mutations.go similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/objx/mutations.go rename to vendor/github.com/stretchr/objx/mutations.go diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/security.go b/vendor/github.com/stretchr/objx/security.go similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/objx/security.go rename to vendor/github.com/stretchr/objx/security.go diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/tests.go b/vendor/github.com/stretchr/objx/tests.go similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/objx/tests.go rename to vendor/github.com/stretchr/objx/tests.go diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen.go b/vendor/github.com/stretchr/objx/type_specific_codegen.go similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen.go rename to vendor/github.com/stretchr/objx/type_specific_codegen.go diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/value.go b/vendor/github.com/stretchr/objx/value.go similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/objx/value.go rename to vendor/github.com/stretchr/objx/value.go diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/LICENCE.txt b/vendor/github.com/stretchr/testify/LICENCE.txt similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/testify/LICENCE.txt rename to vendor/github.com/stretchr/testify/LICENCE.txt diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go b/vendor/github.com/stretchr/testify/assert/assertions.go similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go rename to vendor/github.com/stretchr/testify/assert/assertions.go diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/doc.go b/vendor/github.com/stretchr/testify/assert/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/testify/assert/doc.go rename to vendor/github.com/stretchr/testify/assert/doc.go diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/errors.go b/vendor/github.com/stretchr/testify/assert/errors.go similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/testify/assert/errors.go rename to vendor/github.com/stretchr/testify/assert/errors.go diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/forward_assertions.go b/vendor/github.com/stretchr/testify/assert/forward_assertions.go similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/testify/assert/forward_assertions.go rename to vendor/github.com/stretchr/testify/assert/forward_assertions.go diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/http_assertions.go b/vendor/github.com/stretchr/testify/assert/http_assertions.go similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/testify/assert/http_assertions.go rename to vendor/github.com/stretchr/testify/assert/http_assertions.go diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/mock/doc.go b/vendor/github.com/stretchr/testify/mock/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/testify/mock/doc.go rename to vendor/github.com/stretchr/testify/mock/doc.go diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock.go b/vendor/github.com/stretchr/testify/mock/mock.go similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/testify/mock/mock.go rename to vendor/github.com/stretchr/testify/mock/mock.go diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/require/doc.go b/vendor/github.com/stretchr/testify/require/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/testify/require/doc.go rename to vendor/github.com/stretchr/testify/require/doc.go diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/require/requirements.go b/vendor/github.com/stretchr/testify/require/requirements.go similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/testify/require/requirements.go rename to vendor/github.com/stretchr/testify/require/requirements.go diff --git a/Godeps/_workspace/src/github.com/syndtr/gocapability/LICENSE b/vendor/github.com/syndtr/gocapability/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/gocapability/LICENSE rename to vendor/github.com/syndtr/gocapability/LICENSE diff --git a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability.go b/vendor/github.com/syndtr/gocapability/capability/capability.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability.go rename to vendor/github.com/syndtr/gocapability/capability/capability.go diff --git a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability_linux.go b/vendor/github.com/syndtr/gocapability/capability/capability_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability_linux.go rename to vendor/github.com/syndtr/gocapability/capability/capability_linux.go diff --git a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability_noop.go b/vendor/github.com/syndtr/gocapability/capability/capability_noop.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability_noop.go rename to vendor/github.com/syndtr/gocapability/capability/capability_noop.go diff --git a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/enum.go b/vendor/github.com/syndtr/gocapability/capability/enum.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/gocapability/capability/enum.go rename to vendor/github.com/syndtr/gocapability/capability/enum.go diff --git a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/enum_gen.go b/vendor/github.com/syndtr/gocapability/capability/enum_gen.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/gocapability/capability/enum_gen.go rename to vendor/github.com/syndtr/gocapability/capability/enum_gen.go diff --git a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/syscall_linux.go b/vendor/github.com/syndtr/gocapability/capability/syscall_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/gocapability/capability/syscall_linux.go rename to vendor/github.com/syndtr/gocapability/capability/syscall_linux.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/.travis.yml b/vendor/github.com/vishvananda/netlink/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/.travis.yml rename to vendor/github.com/vishvananda/netlink/.travis.yml diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/LICENSE b/vendor/github.com/vishvananda/netlink/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/LICENSE rename to vendor/github.com/vishvananda/netlink/LICENSE diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/Makefile b/vendor/github.com/vishvananda/netlink/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/Makefile rename to vendor/github.com/vishvananda/netlink/Makefile diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/README.md b/vendor/github.com/vishvananda/netlink/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/README.md rename to vendor/github.com/vishvananda/netlink/README.md diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/addr.go b/vendor/github.com/vishvananda/netlink/addr.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/addr.go rename to vendor/github.com/vishvananda/netlink/addr.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/addr_linux.go b/vendor/github.com/vishvananda/netlink/addr_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/addr_linux.go rename to vendor/github.com/vishvananda/netlink/addr_linux.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/filter.go b/vendor/github.com/vishvananda/netlink/filter.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/filter.go rename to vendor/github.com/vishvananda/netlink/filter.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/filter_linux.go b/vendor/github.com/vishvananda/netlink/filter_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/filter_linux.go rename to vendor/github.com/vishvananda/netlink/filter_linux.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/link.go b/vendor/github.com/vishvananda/netlink/link.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/link.go rename to vendor/github.com/vishvananda/netlink/link.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go b/vendor/github.com/vishvananda/netlink/link_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go rename to vendor/github.com/vishvananda/netlink/link_linux.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/neigh.go b/vendor/github.com/vishvananda/netlink/neigh.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/neigh.go rename to vendor/github.com/vishvananda/netlink/neigh.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_linux.go b/vendor/github.com/vishvananda/netlink/neigh_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_linux.go rename to vendor/github.com/vishvananda/netlink/neigh_linux.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/netlink.go b/vendor/github.com/vishvananda/netlink/netlink.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/netlink.go rename to vendor/github.com/vishvananda/netlink/netlink.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/netlink_unspecified.go b/vendor/github.com/vishvananda/netlink/netlink_unspecified.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/netlink_unspecified.go rename to vendor/github.com/vishvananda/netlink/netlink_unspecified.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/addr_linux.go b/vendor/github.com/vishvananda/netlink/nl/addr_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/addr_linux.go rename to vendor/github.com/vishvananda/netlink/nl/addr_linux.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/link_linux.go b/vendor/github.com/vishvananda/netlink/nl/link_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/link_linux.go rename to vendor/github.com/vishvananda/netlink/nl/link_linux.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/nl_linux.go b/vendor/github.com/vishvananda/netlink/nl/nl_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/nl_linux.go rename to vendor/github.com/vishvananda/netlink/nl/nl_linux.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/route_linux.go b/vendor/github.com/vishvananda/netlink/nl/route_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/route_linux.go rename to vendor/github.com/vishvananda/netlink/nl/route_linux.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/tc_linux.go b/vendor/github.com/vishvananda/netlink/nl/tc_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/tc_linux.go rename to vendor/github.com/vishvananda/netlink/nl/tc_linux.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_linux.go b/vendor/github.com/vishvananda/netlink/nl/xfrm_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_linux.go rename to vendor/github.com/vishvananda/netlink/nl/xfrm_linux.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_policy_linux.go b/vendor/github.com/vishvananda/netlink/nl/xfrm_policy_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_policy_linux.go rename to vendor/github.com/vishvananda/netlink/nl/xfrm_policy_linux.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_state_linux.go b/vendor/github.com/vishvananda/netlink/nl/xfrm_state_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_state_linux.go rename to vendor/github.com/vishvananda/netlink/nl/xfrm_state_linux.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo.go b/vendor/github.com/vishvananda/netlink/protinfo.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo.go rename to vendor/github.com/vishvananda/netlink/protinfo.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_linux.go b/vendor/github.com/vishvananda/netlink/protinfo_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_linux.go rename to vendor/github.com/vishvananda/netlink/protinfo_linux.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc.go b/vendor/github.com/vishvananda/netlink/qdisc.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc.go rename to vendor/github.com/vishvananda/netlink/qdisc.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc_linux.go b/vendor/github.com/vishvananda/netlink/qdisc_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc_linux.go rename to vendor/github.com/vishvananda/netlink/qdisc_linux.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/route.go b/vendor/github.com/vishvananda/netlink/route.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/route.go rename to vendor/github.com/vishvananda/netlink/route.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/route_linux.go b/vendor/github.com/vishvananda/netlink/route_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/route_linux.go rename to vendor/github.com/vishvananda/netlink/route_linux.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm.go b/vendor/github.com/vishvananda/netlink/xfrm.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm.go rename to vendor/github.com/vishvananda/netlink/xfrm.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy.go b/vendor/github.com/vishvananda/netlink/xfrm_policy.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy.go rename to vendor/github.com/vishvananda/netlink/xfrm_policy.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_linux.go b/vendor/github.com/vishvananda/netlink/xfrm_policy_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_linux.go rename to vendor/github.com/vishvananda/netlink/xfrm_policy_linux.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state.go b/vendor/github.com/vishvananda/netlink/xfrm_state.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state.go rename to vendor/github.com/vishvananda/netlink/xfrm_state.go diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_linux.go b/vendor/github.com/vishvananda/netlink/xfrm_state_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_linux.go rename to vendor/github.com/vishvananda/netlink/xfrm_state_linux.go diff --git a/Godeps/_workspace/src/golang.org/x/exp/LICENSE b/vendor/golang.org/x/exp/LICENSE similarity index 100% rename from Godeps/_workspace/src/golang.org/x/exp/LICENSE rename to vendor/golang.org/x/exp/LICENSE diff --git a/Godeps/_workspace/src/golang.org/x/exp/PATENTS b/vendor/golang.org/x/exp/PATENTS similarity index 100% rename from Godeps/_workspace/src/golang.org/x/exp/PATENTS rename to vendor/golang.org/x/exp/PATENTS diff --git a/Godeps/_workspace/src/golang.org/x/exp/inotify/inotify_linux.go b/vendor/golang.org/x/exp/inotify/inotify_linux.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/exp/inotify/inotify_linux.go rename to vendor/golang.org/x/exp/inotify/inotify_linux.go diff --git a/Godeps/_workspace/src/golang.org/x/net/LICENSE b/vendor/golang.org/x/net/LICENSE similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/LICENSE rename to vendor/golang.org/x/net/LICENSE diff --git a/Godeps/_workspace/src/golang.org/x/net/PATENTS b/vendor/golang.org/x/net/PATENTS similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/PATENTS rename to vendor/golang.org/x/net/PATENTS diff --git a/Godeps/_workspace/src/golang.org/x/net/context/context.go b/vendor/golang.org/x/net/context/context.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/context/context.go rename to vendor/golang.org/x/net/context/context.go diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/.gitignore b/vendor/golang.org/x/net/http2/.gitignore similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/.gitignore rename to vendor/golang.org/x/net/http2/.gitignore diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/Dockerfile b/vendor/golang.org/x/net/http2/Dockerfile similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/Dockerfile rename to vendor/golang.org/x/net/http2/Dockerfile diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/Makefile b/vendor/golang.org/x/net/http2/Makefile similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/Makefile rename to vendor/golang.org/x/net/http2/Makefile diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/README b/vendor/golang.org/x/net/http2/README similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/README rename to vendor/golang.org/x/net/http2/README diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/client_conn_pool.go b/vendor/golang.org/x/net/http2/client_conn_pool.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/client_conn_pool.go rename to vendor/golang.org/x/net/http2/client_conn_pool.go diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/configure_transport.go b/vendor/golang.org/x/net/http2/configure_transport.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/configure_transport.go rename to vendor/golang.org/x/net/http2/configure_transport.go diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/errors.go b/vendor/golang.org/x/net/http2/errors.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/errors.go rename to vendor/golang.org/x/net/http2/errors.go diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/fixed_buffer.go b/vendor/golang.org/x/net/http2/fixed_buffer.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/fixed_buffer.go rename to vendor/golang.org/x/net/http2/fixed_buffer.go diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/flow.go b/vendor/golang.org/x/net/http2/flow.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/flow.go rename to vendor/golang.org/x/net/http2/flow.go diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/frame.go b/vendor/golang.org/x/net/http2/frame.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/frame.go rename to vendor/golang.org/x/net/http2/frame.go diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/go15.go b/vendor/golang.org/x/net/http2/go15.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/go15.go rename to vendor/golang.org/x/net/http2/go15.go diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/gotrack.go b/vendor/golang.org/x/net/http2/gotrack.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/gotrack.go rename to vendor/golang.org/x/net/http2/gotrack.go diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/headermap.go b/vendor/golang.org/x/net/http2/headermap.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/headermap.go rename to vendor/golang.org/x/net/http2/headermap.go diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/hpack/encode.go b/vendor/golang.org/x/net/http2/hpack/encode.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/hpack/encode.go rename to vendor/golang.org/x/net/http2/hpack/encode.go diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/hpack/hpack.go b/vendor/golang.org/x/net/http2/hpack/hpack.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/hpack/hpack.go rename to vendor/golang.org/x/net/http2/hpack/hpack.go diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/hpack/huffman.go b/vendor/golang.org/x/net/http2/hpack/huffman.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/hpack/huffman.go rename to vendor/golang.org/x/net/http2/hpack/huffman.go diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/hpack/tables.go b/vendor/golang.org/x/net/http2/hpack/tables.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/hpack/tables.go rename to vendor/golang.org/x/net/http2/hpack/tables.go diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/http2.go b/vendor/golang.org/x/net/http2/http2.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/http2.go rename to vendor/golang.org/x/net/http2/http2.go diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/pipe.go b/vendor/golang.org/x/net/http2/pipe.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/pipe.go rename to vendor/golang.org/x/net/http2/pipe.go diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/server.go b/vendor/golang.org/x/net/http2/server.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/server.go rename to vendor/golang.org/x/net/http2/server.go diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/transport.go b/vendor/golang.org/x/net/http2/transport.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/transport.go rename to vendor/golang.org/x/net/http2/transport.go diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/write.go b/vendor/golang.org/x/net/http2/write.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/write.go rename to vendor/golang.org/x/net/http2/write.go diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/writesched.go b/vendor/golang.org/x/net/http2/writesched.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/http2/writesched.go rename to vendor/golang.org/x/net/http2/writesched.go diff --git a/Godeps/_workspace/src/golang.org/x/net/internal/timeseries/timeseries.go b/vendor/golang.org/x/net/internal/timeseries/timeseries.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/internal/timeseries/timeseries.go rename to vendor/golang.org/x/net/internal/timeseries/timeseries.go diff --git a/Godeps/_workspace/src/golang.org/x/net/proxy/direct.go b/vendor/golang.org/x/net/proxy/direct.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/proxy/direct.go rename to vendor/golang.org/x/net/proxy/direct.go diff --git a/Godeps/_workspace/src/golang.org/x/net/proxy/per_host.go b/vendor/golang.org/x/net/proxy/per_host.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/proxy/per_host.go rename to vendor/golang.org/x/net/proxy/per_host.go diff --git a/Godeps/_workspace/src/golang.org/x/net/proxy/proxy.go b/vendor/golang.org/x/net/proxy/proxy.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/proxy/proxy.go rename to vendor/golang.org/x/net/proxy/proxy.go diff --git a/Godeps/_workspace/src/golang.org/x/net/proxy/socks5.go b/vendor/golang.org/x/net/proxy/socks5.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/proxy/socks5.go rename to vendor/golang.org/x/net/proxy/socks5.go diff --git a/Godeps/_workspace/src/golang.org/x/net/trace/events.go b/vendor/golang.org/x/net/trace/events.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/trace/events.go rename to vendor/golang.org/x/net/trace/events.go diff --git a/Godeps/_workspace/src/golang.org/x/net/trace/histogram.go b/vendor/golang.org/x/net/trace/histogram.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/trace/histogram.go rename to vendor/golang.org/x/net/trace/histogram.go diff --git a/Godeps/_workspace/src/golang.org/x/net/trace/trace.go b/vendor/golang.org/x/net/trace/trace.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/trace/trace.go rename to vendor/golang.org/x/net/trace/trace.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/.travis.yml b/vendor/golang.org/x/oauth2/.travis.yml similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/.travis.yml rename to vendor/golang.org/x/oauth2/.travis.yml diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/AUTHORS b/vendor/golang.org/x/oauth2/AUTHORS similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/AUTHORS rename to vendor/golang.org/x/oauth2/AUTHORS diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/CONTRIBUTING.md b/vendor/golang.org/x/oauth2/CONTRIBUTING.md similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/CONTRIBUTING.md rename to vendor/golang.org/x/oauth2/CONTRIBUTING.md diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/CONTRIBUTORS b/vendor/golang.org/x/oauth2/CONTRIBUTORS similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/CONTRIBUTORS rename to vendor/golang.org/x/oauth2/CONTRIBUTORS diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/LICENSE b/vendor/golang.org/x/oauth2/LICENSE similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/LICENSE rename to vendor/golang.org/x/oauth2/LICENSE diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/README.md b/vendor/golang.org/x/oauth2/README.md similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/README.md rename to vendor/golang.org/x/oauth2/README.md diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/client_appengine.go b/vendor/golang.org/x/oauth2/client_appengine.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/client_appengine.go rename to vendor/golang.org/x/oauth2/client_appengine.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/internal/oauth2.go b/vendor/golang.org/x/oauth2/internal/oauth2.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/internal/oauth2.go rename to vendor/golang.org/x/oauth2/internal/oauth2.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/jws/jws.go b/vendor/golang.org/x/oauth2/jws/jws.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/jws/jws.go rename to vendor/golang.org/x/oauth2/jws/jws.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/jwt/jwt.go b/vendor/golang.org/x/oauth2/jwt/jwt.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/jwt/jwt.go rename to vendor/golang.org/x/oauth2/jwt/jwt.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/oauth2.go b/vendor/golang.org/x/oauth2/oauth2.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/oauth2.go rename to vendor/golang.org/x/oauth2/oauth2.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/token.go b/vendor/golang.org/x/oauth2/token.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/token.go rename to vendor/golang.org/x/oauth2/token.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/transport.go b/vendor/golang.org/x/oauth2/transport.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/transport.go rename to vendor/golang.org/x/oauth2/transport.go diff --git a/Godeps/_workspace/src/google.golang.org/api/LICENSE b/vendor/google.golang.org/api/LICENSE similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/LICENSE rename to vendor/google.golang.org/api/LICENSE diff --git a/Godeps/_workspace/src/google.golang.org/api/bigquery/v2/bigquery-api.json b/vendor/google.golang.org/api/bigquery/v2/bigquery-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/bigquery/v2/bigquery-api.json rename to vendor/google.golang.org/api/bigquery/v2/bigquery-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/bigquery/v2/bigquery-gen.go b/vendor/google.golang.org/api/bigquery/v2/bigquery-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/bigquery/v2/bigquery-gen.go rename to vendor/google.golang.org/api/bigquery/v2/bigquery-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/googleapi.go b/vendor/google.golang.org/api/googleapi/googleapi.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/googleapi/googleapi.go rename to vendor/google.golang.org/api/googleapi/googleapi.go diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/LICENSE b/vendor/google.golang.org/api/googleapi/internal/uritemplates/LICENSE similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/LICENSE rename to vendor/google.golang.org/api/googleapi/internal/uritemplates/LICENSE diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/uritemplates.go b/vendor/google.golang.org/api/googleapi/internal/uritemplates/uritemplates.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/uritemplates.go rename to vendor/google.golang.org/api/googleapi/internal/uritemplates/uritemplates.go diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/utils.go b/vendor/google.golang.org/api/googleapi/internal/uritemplates/utils.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/utils.go rename to vendor/google.golang.org/api/googleapi/internal/uritemplates/utils.go diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/types.go b/vendor/google.golang.org/api/googleapi/types.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/googleapi/types.go rename to vendor/google.golang.org/api/googleapi/types.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/LICENSE b/vendor/google.golang.org/cloud/LICENSE similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/LICENSE rename to vendor/google.golang.org/cloud/LICENSE diff --git a/Godeps/_workspace/src/google.golang.org/cloud/compute/metadata/metadata.go b/vendor/google.golang.org/cloud/compute/metadata/metadata.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/compute/metadata/metadata.go rename to vendor/google.golang.org/cloud/compute/metadata/metadata.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/internal/cloud.go b/vendor/google.golang.org/cloud/internal/cloud.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/internal/cloud.go rename to vendor/google.golang.org/cloud/internal/cloud.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/.travis.yml b/vendor/google.golang.org/grpc/.travis.yml similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/.travis.yml rename to vendor/google.golang.org/grpc/.travis.yml diff --git a/Godeps/_workspace/src/google.golang.org/grpc/CONTRIBUTING.md b/vendor/google.golang.org/grpc/CONTRIBUTING.md similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/CONTRIBUTING.md rename to vendor/google.golang.org/grpc/CONTRIBUTING.md diff --git a/Godeps/_workspace/src/google.golang.org/grpc/LICENSE b/vendor/google.golang.org/grpc/LICENSE similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/LICENSE rename to vendor/google.golang.org/grpc/LICENSE diff --git a/Godeps/_workspace/src/google.golang.org/grpc/Makefile b/vendor/google.golang.org/grpc/Makefile similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/Makefile rename to vendor/google.golang.org/grpc/Makefile diff --git a/Godeps/_workspace/src/google.golang.org/grpc/PATENTS b/vendor/google.golang.org/grpc/PATENTS similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/PATENTS rename to vendor/google.golang.org/grpc/PATENTS diff --git a/Godeps/_workspace/src/google.golang.org/grpc/README.md b/vendor/google.golang.org/grpc/README.md similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/README.md rename to vendor/google.golang.org/grpc/README.md diff --git a/Godeps/_workspace/src/google.golang.org/grpc/call.go b/vendor/google.golang.org/grpc/call.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/call.go rename to vendor/google.golang.org/grpc/call.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/clientconn.go b/vendor/google.golang.org/grpc/clientconn.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/clientconn.go rename to vendor/google.golang.org/grpc/clientconn.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/codegen.sh b/vendor/google.golang.org/grpc/codegen.sh old mode 100644 new mode 100755 similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/codegen.sh rename to vendor/google.golang.org/grpc/codegen.sh diff --git a/Godeps/_workspace/src/google.golang.org/grpc/codes/code_string.go b/vendor/google.golang.org/grpc/codes/code_string.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/codes/code_string.go rename to vendor/google.golang.org/grpc/codes/code_string.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/codes/codes.go b/vendor/google.golang.org/grpc/codes/codes.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/codes/codes.go rename to vendor/google.golang.org/grpc/codes/codes.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/coverage.sh b/vendor/google.golang.org/grpc/coverage.sh old mode 100644 new mode 100755 similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/coverage.sh rename to vendor/google.golang.org/grpc/coverage.sh diff --git a/Godeps/_workspace/src/google.golang.org/grpc/credentials/credentials.go b/vendor/google.golang.org/grpc/credentials/credentials.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/credentials/credentials.go rename to vendor/google.golang.org/grpc/credentials/credentials.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/doc.go b/vendor/google.golang.org/grpc/doc.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/doc.go rename to vendor/google.golang.org/grpc/doc.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/grpclog/logger.go b/vendor/google.golang.org/grpc/grpclog/logger.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/grpclog/logger.go rename to vendor/google.golang.org/grpc/grpclog/logger.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/metadata/metadata.go b/vendor/google.golang.org/grpc/metadata/metadata.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/metadata/metadata.go rename to vendor/google.golang.org/grpc/metadata/metadata.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/naming/naming.go b/vendor/google.golang.org/grpc/naming/naming.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/naming/naming.go rename to vendor/google.golang.org/grpc/naming/naming.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/peer/peer.go b/vendor/google.golang.org/grpc/peer/peer.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/peer/peer.go rename to vendor/google.golang.org/grpc/peer/peer.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/picker.go b/vendor/google.golang.org/grpc/picker.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/picker.go rename to vendor/google.golang.org/grpc/picker.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/rpc_util.go b/vendor/google.golang.org/grpc/rpc_util.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/rpc_util.go rename to vendor/google.golang.org/grpc/rpc_util.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/server.go b/vendor/google.golang.org/grpc/server.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/server.go rename to vendor/google.golang.org/grpc/server.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/stream.go b/vendor/google.golang.org/grpc/stream.go similarity index 99% rename from Godeps/_workspace/src/google.golang.org/grpc/stream.go rename to vendor/google.golang.org/grpc/stream.go index 4974d8a8..775b9ee0 100644 --- a/Godeps/_workspace/src/google.golang.org/grpc/stream.go +++ b/vendor/google.golang.org/grpc/stream.go @@ -109,7 +109,7 @@ func NewClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth callHdr := &transport.CallHdr{ Host: cc.authority, Method: method, - Flush: desc.ServerStreams&&desc.ClientStreams, + Flush: desc.ServerStreams && desc.ClientStreams, } if cc.dopts.cp != nil { callHdr.SendCompress = cc.dopts.cp.Type() diff --git a/Godeps/_workspace/src/google.golang.org/grpc/trace.go b/vendor/google.golang.org/grpc/trace.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/trace.go rename to vendor/google.golang.org/grpc/trace.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/control.go b/vendor/google.golang.org/grpc/transport/control.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/transport/control.go rename to vendor/google.golang.org/grpc/transport/control.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/http2_client.go b/vendor/google.golang.org/grpc/transport/http2_client.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/transport/http2_client.go rename to vendor/google.golang.org/grpc/transport/http2_client.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/http2_server.go b/vendor/google.golang.org/grpc/transport/http2_server.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/transport/http2_server.go rename to vendor/google.golang.org/grpc/transport/http2_server.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/http_util.go b/vendor/google.golang.org/grpc/transport/http_util.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/transport/http_util.go rename to vendor/google.golang.org/grpc/transport/http_util.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/transport.go b/vendor/google.golang.org/grpc/transport/transport.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/transport/transport.go rename to vendor/google.golang.org/grpc/transport/transport.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/.gitignore b/vendor/gopkg.in/olivere/elastic.v2/.gitignore similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/.gitignore rename to vendor/gopkg.in/olivere/elastic.v2/.gitignore diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/.travis.yml b/vendor/gopkg.in/olivere/elastic.v2/.travis.yml similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/.travis.yml rename to vendor/gopkg.in/olivere/elastic.v2/.travis.yml diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/CONTRIBUTING.md b/vendor/gopkg.in/olivere/elastic.v2/CONTRIBUTING.md similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/CONTRIBUTING.md rename to vendor/gopkg.in/olivere/elastic.v2/CONTRIBUTING.md diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/CONTRIBUTORS b/vendor/gopkg.in/olivere/elastic.v2/CONTRIBUTORS similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/CONTRIBUTORS rename to vendor/gopkg.in/olivere/elastic.v2/CONTRIBUTORS diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/LICENSE b/vendor/gopkg.in/olivere/elastic.v2/LICENSE similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/LICENSE rename to vendor/gopkg.in/olivere/elastic.v2/LICENSE diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/README.md b/vendor/gopkg.in/olivere/elastic.v2/README.md similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/README.md rename to vendor/gopkg.in/olivere/elastic.v2/README.md diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/alias.go b/vendor/gopkg.in/olivere/elastic.v2/alias.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/alias.go rename to vendor/gopkg.in/olivere/elastic.v2/alias.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/aliases.go b/vendor/gopkg.in/olivere/elastic.v2/aliases.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/aliases.go rename to vendor/gopkg.in/olivere/elastic.v2/aliases.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/bulk.go b/vendor/gopkg.in/olivere/elastic.v2/bulk.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/bulk.go rename to vendor/gopkg.in/olivere/elastic.v2/bulk.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/bulk_delete_request.go b/vendor/gopkg.in/olivere/elastic.v2/bulk_delete_request.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/bulk_delete_request.go rename to vendor/gopkg.in/olivere/elastic.v2/bulk_delete_request.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/bulk_index_request.go b/vendor/gopkg.in/olivere/elastic.v2/bulk_index_request.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/bulk_index_request.go rename to vendor/gopkg.in/olivere/elastic.v2/bulk_index_request.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/bulk_request.go b/vendor/gopkg.in/olivere/elastic.v2/bulk_request.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/bulk_request.go rename to vendor/gopkg.in/olivere/elastic.v2/bulk_request.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/bulk_update_request.go b/vendor/gopkg.in/olivere/elastic.v2/bulk_update_request.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/bulk_update_request.go rename to vendor/gopkg.in/olivere/elastic.v2/bulk_update_request.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/canonicalize.go b/vendor/gopkg.in/olivere/elastic.v2/canonicalize.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/canonicalize.go rename to vendor/gopkg.in/olivere/elastic.v2/canonicalize.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/clear_scroll.go b/vendor/gopkg.in/olivere/elastic.v2/clear_scroll.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/clear_scroll.go rename to vendor/gopkg.in/olivere/elastic.v2/clear_scroll.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/client.go b/vendor/gopkg.in/olivere/elastic.v2/client.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/client.go rename to vendor/gopkg.in/olivere/elastic.v2/client.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/cluster_health.go b/vendor/gopkg.in/olivere/elastic.v2/cluster_health.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/cluster_health.go rename to vendor/gopkg.in/olivere/elastic.v2/cluster_health.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/cluster_state.go b/vendor/gopkg.in/olivere/elastic.v2/cluster_state.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/cluster_state.go rename to vendor/gopkg.in/olivere/elastic.v2/cluster_state.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/cluster_stats.go b/vendor/gopkg.in/olivere/elastic.v2/cluster_stats.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/cluster_stats.go rename to vendor/gopkg.in/olivere/elastic.v2/cluster_stats.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/connection.go b/vendor/gopkg.in/olivere/elastic.v2/connection.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/connection.go rename to vendor/gopkg.in/olivere/elastic.v2/connection.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/count.go b/vendor/gopkg.in/olivere/elastic.v2/count.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/count.go rename to vendor/gopkg.in/olivere/elastic.v2/count.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/create_index.go b/vendor/gopkg.in/olivere/elastic.v2/create_index.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/create_index.go rename to vendor/gopkg.in/olivere/elastic.v2/create_index.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/decoder.go b/vendor/gopkg.in/olivere/elastic.v2/decoder.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/decoder.go rename to vendor/gopkg.in/olivere/elastic.v2/decoder.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/delete.go b/vendor/gopkg.in/olivere/elastic.v2/delete.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/delete.go rename to vendor/gopkg.in/olivere/elastic.v2/delete.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/delete_by_query.go b/vendor/gopkg.in/olivere/elastic.v2/delete_by_query.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/delete_by_query.go rename to vendor/gopkg.in/olivere/elastic.v2/delete_by_query.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/delete_index.go b/vendor/gopkg.in/olivere/elastic.v2/delete_index.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/delete_index.go rename to vendor/gopkg.in/olivere/elastic.v2/delete_index.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/delete_mapping.go b/vendor/gopkg.in/olivere/elastic.v2/delete_mapping.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/delete_mapping.go rename to vendor/gopkg.in/olivere/elastic.v2/delete_mapping.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/delete_template.go b/vendor/gopkg.in/olivere/elastic.v2/delete_template.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/delete_template.go rename to vendor/gopkg.in/olivere/elastic.v2/delete_template.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/doc.go b/vendor/gopkg.in/olivere/elastic.v2/doc.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/doc.go rename to vendor/gopkg.in/olivere/elastic.v2/doc.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/errors.go b/vendor/gopkg.in/olivere/elastic.v2/errors.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/errors.go rename to vendor/gopkg.in/olivere/elastic.v2/errors.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/exists.go b/vendor/gopkg.in/olivere/elastic.v2/exists.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/exists.go rename to vendor/gopkg.in/olivere/elastic.v2/exists.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/explain.go b/vendor/gopkg.in/olivere/elastic.v2/explain.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/explain.go rename to vendor/gopkg.in/olivere/elastic.v2/explain.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/fetch_source_context.go b/vendor/gopkg.in/olivere/elastic.v2/fetch_source_context.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/fetch_source_context.go rename to vendor/gopkg.in/olivere/elastic.v2/fetch_source_context.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/filter.go b/vendor/gopkg.in/olivere/elastic.v2/filter.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/filter.go rename to vendor/gopkg.in/olivere/elastic.v2/filter.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/flush.go b/vendor/gopkg.in/olivere/elastic.v2/flush.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/flush.go rename to vendor/gopkg.in/olivere/elastic.v2/flush.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/geo_point.go b/vendor/gopkg.in/olivere/elastic.v2/geo_point.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/geo_point.go rename to vendor/gopkg.in/olivere/elastic.v2/geo_point.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/get.go b/vendor/gopkg.in/olivere/elastic.v2/get.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/get.go rename to vendor/gopkg.in/olivere/elastic.v2/get.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/get_mapping.go b/vendor/gopkg.in/olivere/elastic.v2/get_mapping.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/get_mapping.go rename to vendor/gopkg.in/olivere/elastic.v2/get_mapping.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/get_template.go b/vendor/gopkg.in/olivere/elastic.v2/get_template.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/get_template.go rename to vendor/gopkg.in/olivere/elastic.v2/get_template.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/highlight.go b/vendor/gopkg.in/olivere/elastic.v2/highlight.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/highlight.go rename to vendor/gopkg.in/olivere/elastic.v2/highlight.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/index.go b/vendor/gopkg.in/olivere/elastic.v2/index.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/index.go rename to vendor/gopkg.in/olivere/elastic.v2/index.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/index_close.go b/vendor/gopkg.in/olivere/elastic.v2/index_close.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/index_close.go rename to vendor/gopkg.in/olivere/elastic.v2/index_close.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/index_exists.go b/vendor/gopkg.in/olivere/elastic.v2/index_exists.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/index_exists.go rename to vendor/gopkg.in/olivere/elastic.v2/index_exists.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/index_get.go b/vendor/gopkg.in/olivere/elastic.v2/index_get.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/index_get.go rename to vendor/gopkg.in/olivere/elastic.v2/index_get.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/index_get_settings.go b/vendor/gopkg.in/olivere/elastic.v2/index_get_settings.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/index_get_settings.go rename to vendor/gopkg.in/olivere/elastic.v2/index_get_settings.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/index_open.go b/vendor/gopkg.in/olivere/elastic.v2/index_open.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/index_open.go rename to vendor/gopkg.in/olivere/elastic.v2/index_open.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/indices_delete_template.go b/vendor/gopkg.in/olivere/elastic.v2/indices_delete_template.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/indices_delete_template.go rename to vendor/gopkg.in/olivere/elastic.v2/indices_delete_template.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/indices_exists_template.go b/vendor/gopkg.in/olivere/elastic.v2/indices_exists_template.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/indices_exists_template.go rename to vendor/gopkg.in/olivere/elastic.v2/indices_exists_template.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/indices_exists_type.go b/vendor/gopkg.in/olivere/elastic.v2/indices_exists_type.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/indices_exists_type.go rename to vendor/gopkg.in/olivere/elastic.v2/indices_exists_type.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/indices_get_template.go b/vendor/gopkg.in/olivere/elastic.v2/indices_get_template.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/indices_get_template.go rename to vendor/gopkg.in/olivere/elastic.v2/indices_get_template.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/indices_put_template.go b/vendor/gopkg.in/olivere/elastic.v2/indices_put_template.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/indices_put_template.go rename to vendor/gopkg.in/olivere/elastic.v2/indices_put_template.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/indices_stats.go b/vendor/gopkg.in/olivere/elastic.v2/indices_stats.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/indices_stats.go rename to vendor/gopkg.in/olivere/elastic.v2/indices_stats.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/inner_hit.go b/vendor/gopkg.in/olivere/elastic.v2/inner_hit.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/inner_hit.go rename to vendor/gopkg.in/olivere/elastic.v2/inner_hit.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/multi_get.go b/vendor/gopkg.in/olivere/elastic.v2/multi_get.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/multi_get.go rename to vendor/gopkg.in/olivere/elastic.v2/multi_get.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/multi_search.go b/vendor/gopkg.in/olivere/elastic.v2/multi_search.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/multi_search.go rename to vendor/gopkg.in/olivere/elastic.v2/multi_search.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/nodes_info.go b/vendor/gopkg.in/olivere/elastic.v2/nodes_info.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/nodes_info.go rename to vendor/gopkg.in/olivere/elastic.v2/nodes_info.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/optimize.go b/vendor/gopkg.in/olivere/elastic.v2/optimize.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/optimize.go rename to vendor/gopkg.in/olivere/elastic.v2/optimize.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/percolate.go b/vendor/gopkg.in/olivere/elastic.v2/percolate.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/percolate.go rename to vendor/gopkg.in/olivere/elastic.v2/percolate.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/ping.go b/vendor/gopkg.in/olivere/elastic.v2/ping.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/ping.go rename to vendor/gopkg.in/olivere/elastic.v2/ping.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/put_mapping.go b/vendor/gopkg.in/olivere/elastic.v2/put_mapping.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/put_mapping.go rename to vendor/gopkg.in/olivere/elastic.v2/put_mapping.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/put_template.go b/vendor/gopkg.in/olivere/elastic.v2/put_template.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/put_template.go rename to vendor/gopkg.in/olivere/elastic.v2/put_template.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/query.go b/vendor/gopkg.in/olivere/elastic.v2/query.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/query.go rename to vendor/gopkg.in/olivere/elastic.v2/query.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/refresh.go b/vendor/gopkg.in/olivere/elastic.v2/refresh.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/refresh.go rename to vendor/gopkg.in/olivere/elastic.v2/refresh.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/reindexer.go b/vendor/gopkg.in/olivere/elastic.v2/reindexer.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/reindexer.go rename to vendor/gopkg.in/olivere/elastic.v2/reindexer.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/request.go b/vendor/gopkg.in/olivere/elastic.v2/request.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/request.go rename to vendor/gopkg.in/olivere/elastic.v2/request.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/rescore.go b/vendor/gopkg.in/olivere/elastic.v2/rescore.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/rescore.go rename to vendor/gopkg.in/olivere/elastic.v2/rescore.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/rescorer.go b/vendor/gopkg.in/olivere/elastic.v2/rescorer.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/rescorer.go rename to vendor/gopkg.in/olivere/elastic.v2/rescorer.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/response.go b/vendor/gopkg.in/olivere/elastic.v2/response.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/response.go rename to vendor/gopkg.in/olivere/elastic.v2/response.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/scan.go b/vendor/gopkg.in/olivere/elastic.v2/scan.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/scan.go rename to vendor/gopkg.in/olivere/elastic.v2/scan.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/scroll.go b/vendor/gopkg.in/olivere/elastic.v2/scroll.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/scroll.go rename to vendor/gopkg.in/olivere/elastic.v2/scroll.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search.go b/vendor/gopkg.in/olivere/elastic.v2/search.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search.go rename to vendor/gopkg.in/olivere/elastic.v2/search.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_avg.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_avg.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_avg.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_avg.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_cardinality.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_cardinality.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_cardinality.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_cardinality.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_children.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_children.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_children.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_children.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_date_histogram.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_date_histogram.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_date_histogram.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_date_histogram.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_date_range.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_date_range.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_date_range.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_date_range.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_extended_stats.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_extended_stats.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_extended_stats.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_extended_stats.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_filter.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_filter.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_filter.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_filter.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_filters.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_filters.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_filters.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_filters.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_geo_bounds.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_geo_bounds.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_geo_bounds.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_geo_bounds.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_geo_distance.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_geo_distance.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_geo_distance.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_geo_distance.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_global.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_global.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_global.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_global.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_histogram.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_histogram.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_histogram.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_histogram.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_max.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_max.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_max.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_max.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_min.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_min.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_min.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_min.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_missing.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_missing.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_missing.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_missing.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_nested.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_nested.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_nested.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_nested.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_percentile_ranks.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_percentile_ranks.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_percentile_ranks.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_percentile_ranks.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_percentiles.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_percentiles.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_percentiles.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_percentiles.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_range.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_range.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_range.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_range.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_significant_terms.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_significant_terms.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_significant_terms.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_significant_terms.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_stats.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_stats.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_stats.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_stats.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_sum.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_sum.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_sum.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_sum.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_terms.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_terms.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_terms.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_terms.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_tophits.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_tophits.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_tophits.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_tophits.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_value_count.go b/vendor/gopkg.in/olivere/elastic.v2/search_aggs_value_count.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_aggs_value_count.go rename to vendor/gopkg.in/olivere/elastic.v2/search_aggs_value_count.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets.go b/vendor/gopkg.in/olivere/elastic.v2/search_facets.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets.go rename to vendor/gopkg.in/olivere/elastic.v2/search_facets.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets_date_histogram.go b/vendor/gopkg.in/olivere/elastic.v2/search_facets_date_histogram.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets_date_histogram.go rename to vendor/gopkg.in/olivere/elastic.v2/search_facets_date_histogram.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets_filter.go b/vendor/gopkg.in/olivere/elastic.v2/search_facets_filter.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets_filter.go rename to vendor/gopkg.in/olivere/elastic.v2/search_facets_filter.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets_geo_distance.go b/vendor/gopkg.in/olivere/elastic.v2/search_facets_geo_distance.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets_geo_distance.go rename to vendor/gopkg.in/olivere/elastic.v2/search_facets_geo_distance.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets_histogram.go b/vendor/gopkg.in/olivere/elastic.v2/search_facets_histogram.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets_histogram.go rename to vendor/gopkg.in/olivere/elastic.v2/search_facets_histogram.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets_histogram_script.go b/vendor/gopkg.in/olivere/elastic.v2/search_facets_histogram_script.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets_histogram_script.go rename to vendor/gopkg.in/olivere/elastic.v2/search_facets_histogram_script.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets_query.go b/vendor/gopkg.in/olivere/elastic.v2/search_facets_query.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets_query.go rename to vendor/gopkg.in/olivere/elastic.v2/search_facets_query.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets_range.go b/vendor/gopkg.in/olivere/elastic.v2/search_facets_range.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets_range.go rename to vendor/gopkg.in/olivere/elastic.v2/search_facets_range.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets_statistical.go b/vendor/gopkg.in/olivere/elastic.v2/search_facets_statistical.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets_statistical.go rename to vendor/gopkg.in/olivere/elastic.v2/search_facets_statistical.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets_statistical_script.go b/vendor/gopkg.in/olivere/elastic.v2/search_facets_statistical_script.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets_statistical_script.go rename to vendor/gopkg.in/olivere/elastic.v2/search_facets_statistical_script.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets_terms.go b/vendor/gopkg.in/olivere/elastic.v2/search_facets_terms.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets_terms.go rename to vendor/gopkg.in/olivere/elastic.v2/search_facets_terms.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets_terms_stats.go b/vendor/gopkg.in/olivere/elastic.v2/search_facets_terms_stats.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_facets_terms_stats.go rename to vendor/gopkg.in/olivere/elastic.v2/search_facets_terms_stats.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_and.go b/vendor/gopkg.in/olivere/elastic.v2/search_filters_and.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_and.go rename to vendor/gopkg.in/olivere/elastic.v2/search_filters_and.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_bool.go b/vendor/gopkg.in/olivere/elastic.v2/search_filters_bool.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_bool.go rename to vendor/gopkg.in/olivere/elastic.v2/search_filters_bool.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_exists.go b/vendor/gopkg.in/olivere/elastic.v2/search_filters_exists.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_exists.go rename to vendor/gopkg.in/olivere/elastic.v2/search_filters_exists.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_geo_distance.go b/vendor/gopkg.in/olivere/elastic.v2/search_filters_geo_distance.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_geo_distance.go rename to vendor/gopkg.in/olivere/elastic.v2/search_filters_geo_distance.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_geo_polygon.go b/vendor/gopkg.in/olivere/elastic.v2/search_filters_geo_polygon.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_geo_polygon.go rename to vendor/gopkg.in/olivere/elastic.v2/search_filters_geo_polygon.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_has_child.go b/vendor/gopkg.in/olivere/elastic.v2/search_filters_has_child.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_has_child.go rename to vendor/gopkg.in/olivere/elastic.v2/search_filters_has_child.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_has_parent.go b/vendor/gopkg.in/olivere/elastic.v2/search_filters_has_parent.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_has_parent.go rename to vendor/gopkg.in/olivere/elastic.v2/search_filters_has_parent.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_ids.go b/vendor/gopkg.in/olivere/elastic.v2/search_filters_ids.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_ids.go rename to vendor/gopkg.in/olivere/elastic.v2/search_filters_ids.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_limit.go b/vendor/gopkg.in/olivere/elastic.v2/search_filters_limit.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_limit.go rename to vendor/gopkg.in/olivere/elastic.v2/search_filters_limit.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_match_all.go b/vendor/gopkg.in/olivere/elastic.v2/search_filters_match_all.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_match_all.go rename to vendor/gopkg.in/olivere/elastic.v2/search_filters_match_all.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_missing.go b/vendor/gopkg.in/olivere/elastic.v2/search_filters_missing.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_missing.go rename to vendor/gopkg.in/olivere/elastic.v2/search_filters_missing.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_nested.go b/vendor/gopkg.in/olivere/elastic.v2/search_filters_nested.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_nested.go rename to vendor/gopkg.in/olivere/elastic.v2/search_filters_nested.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_not.go b/vendor/gopkg.in/olivere/elastic.v2/search_filters_not.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_not.go rename to vendor/gopkg.in/olivere/elastic.v2/search_filters_not.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_or.go b/vendor/gopkg.in/olivere/elastic.v2/search_filters_or.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_or.go rename to vendor/gopkg.in/olivere/elastic.v2/search_filters_or.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_prefix.go b/vendor/gopkg.in/olivere/elastic.v2/search_filters_prefix.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_prefix.go rename to vendor/gopkg.in/olivere/elastic.v2/search_filters_prefix.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_query.go b/vendor/gopkg.in/olivere/elastic.v2/search_filters_query.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_query.go rename to vendor/gopkg.in/olivere/elastic.v2/search_filters_query.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_range.go b/vendor/gopkg.in/olivere/elastic.v2/search_filters_range.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_range.go rename to vendor/gopkg.in/olivere/elastic.v2/search_filters_range.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_regexp.go b/vendor/gopkg.in/olivere/elastic.v2/search_filters_regexp.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_regexp.go rename to vendor/gopkg.in/olivere/elastic.v2/search_filters_regexp.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_term.go b/vendor/gopkg.in/olivere/elastic.v2/search_filters_term.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_term.go rename to vendor/gopkg.in/olivere/elastic.v2/search_filters_term.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_terms.go b/vendor/gopkg.in/olivere/elastic.v2/search_filters_terms.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_terms.go rename to vendor/gopkg.in/olivere/elastic.v2/search_filters_terms.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_type.go b/vendor/gopkg.in/olivere/elastic.v2/search_filters_type.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_filters_type.go rename to vendor/gopkg.in/olivere/elastic.v2/search_filters_type.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_bool.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_bool.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_bool.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_bool.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_boosting.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_boosting.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_boosting.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_boosting.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_common.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_common.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_common.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_common.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_custom_filters_score.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_custom_filters_score.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_custom_filters_score.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_custom_filters_score.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_custom_score.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_custom_score.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_custom_score.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_custom_score.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_dis_max.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_dis_max.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_dis_max.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_dis_max.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_filtered.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_filtered.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_filtered.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_filtered.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_fsq.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_fsq.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_fsq.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_fsq.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_fsq_score_funcs.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_fsq_score_funcs.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_fsq_score_funcs.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_fsq_score_funcs.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_fuzzy.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_fuzzy.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_fuzzy.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_fuzzy.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_fuzzy_like_this.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_fuzzy_like_this.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_fuzzy_like_this.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_fuzzy_like_this.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_fuzzy_like_this_field_query.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_fuzzy_like_this_field_query.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_fuzzy_like_this_field_query.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_fuzzy_like_this_field_query.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_has_child.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_has_child.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_has_child.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_has_child.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_has_parent.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_has_parent.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_has_parent.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_has_parent.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_ids.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_ids.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_ids.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_ids.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_match.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_match.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_match.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_match.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_match_all.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_match_all.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_match_all.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_match_all.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_more_like_this.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_more_like_this.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_more_like_this.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_more_like_this.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_more_like_this_field.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_more_like_this_field.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_more_like_this_field.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_more_like_this_field.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_multi_match.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_multi_match.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_multi_match.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_multi_match.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_nested.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_nested.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_nested.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_nested.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_prefix.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_prefix.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_prefix.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_prefix.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_query_string.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_query_string.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_query_string.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_query_string.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_range.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_range.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_range.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_range.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_regexp.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_regexp.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_regexp.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_regexp.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_simple_query_string.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_simple_query_string.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_simple_query_string.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_simple_query_string.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_template_query.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_template_query.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_template_query.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_template_query.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_term.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_term.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_term.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_term.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_terms.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_terms.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_terms.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_terms.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_wildcard.go b/vendor/gopkg.in/olivere/elastic.v2/search_queries_wildcard.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_queries_wildcard.go rename to vendor/gopkg.in/olivere/elastic.v2/search_queries_wildcard.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_request.go b/vendor/gopkg.in/olivere/elastic.v2/search_request.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_request.go rename to vendor/gopkg.in/olivere/elastic.v2/search_request.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_source.go b/vendor/gopkg.in/olivere/elastic.v2/search_source.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/search_source.go rename to vendor/gopkg.in/olivere/elastic.v2/search_source.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/sort.go b/vendor/gopkg.in/olivere/elastic.v2/sort.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/sort.go rename to vendor/gopkg.in/olivere/elastic.v2/sort.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/suggest.go b/vendor/gopkg.in/olivere/elastic.v2/suggest.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/suggest.go rename to vendor/gopkg.in/olivere/elastic.v2/suggest.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/suggest_field.go b/vendor/gopkg.in/olivere/elastic.v2/suggest_field.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/suggest_field.go rename to vendor/gopkg.in/olivere/elastic.v2/suggest_field.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/suggester.go b/vendor/gopkg.in/olivere/elastic.v2/suggester.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/suggester.go rename to vendor/gopkg.in/olivere/elastic.v2/suggester.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/suggester_completion.go b/vendor/gopkg.in/olivere/elastic.v2/suggester_completion.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/suggester_completion.go rename to vendor/gopkg.in/olivere/elastic.v2/suggester_completion.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/suggester_completion_fuzzy.go b/vendor/gopkg.in/olivere/elastic.v2/suggester_completion_fuzzy.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/suggester_completion_fuzzy.go rename to vendor/gopkg.in/olivere/elastic.v2/suggester_completion_fuzzy.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/suggester_context.go b/vendor/gopkg.in/olivere/elastic.v2/suggester_context.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/suggester_context.go rename to vendor/gopkg.in/olivere/elastic.v2/suggester_context.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/suggester_context_category.go b/vendor/gopkg.in/olivere/elastic.v2/suggester_context_category.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/suggester_context_category.go rename to vendor/gopkg.in/olivere/elastic.v2/suggester_context_category.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/suggester_context_geo.go b/vendor/gopkg.in/olivere/elastic.v2/suggester_context_geo.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/suggester_context_geo.go rename to vendor/gopkg.in/olivere/elastic.v2/suggester_context_geo.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/suggester_phrase.go b/vendor/gopkg.in/olivere/elastic.v2/suggester_phrase.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/suggester_phrase.go rename to vendor/gopkg.in/olivere/elastic.v2/suggester_phrase.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/suggester_term.go b/vendor/gopkg.in/olivere/elastic.v2/suggester_term.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/suggester_term.go rename to vendor/gopkg.in/olivere/elastic.v2/suggester_term.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/update.go b/vendor/gopkg.in/olivere/elastic.v2/update.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/update.go rename to vendor/gopkg.in/olivere/elastic.v2/update.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/uritemplates/LICENSE b/vendor/gopkg.in/olivere/elastic.v2/uritemplates/LICENSE similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/uritemplates/LICENSE rename to vendor/gopkg.in/olivere/elastic.v2/uritemplates/LICENSE diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/uritemplates/uritemplates.go b/vendor/gopkg.in/olivere/elastic.v2/uritemplates/uritemplates.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/uritemplates/uritemplates.go rename to vendor/gopkg.in/olivere/elastic.v2/uritemplates/uritemplates.go diff --git a/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/uritemplates/utils.go b/vendor/gopkg.in/olivere/elastic.v2/uritemplates/utils.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/uritemplates/utils.go rename to vendor/gopkg.in/olivere/elastic.v2/uritemplates/utils.go