Move third_party code under third_party/src so it can be used in $GOP…

…ATH.
kubernetes · Jun 14, 2014 · d230625 · d230625
1 parent a40529b
commit d230625
Show file tree

Hide file tree

Showing 127 changed files with 7 additions and 7 deletions.
diff --git a/hack/config-go.sh b/hack/config-go.sh
@@ -53,7 +53,7 @@ KUBE_GO_PACKAGE_DIR="${GOPATH}/src/${KUBE_GO_PACKAGE}"
     fi
 
     rm "${PACKAGE_DIR}" >/dev/null 2>&1 || true
-    ln -s "${THIRD_PARTY_BASE}/${p}" "${PACKAGE_DIR}"
+    ln -s "${THIRD_PARTY_BASE}/src/${p}" "${PACKAGE_DIR}"
   done
 
   for p in ${PACKAGES}; do

diff --git a/hooks/prepare-commit-msg b/hooks/prepare-commit-msg
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 errors=0
-for file in $(git diff --cached --name-only | grep "\.go"); do
+for file in $(git diff --cached --name-only --diff-filter ACM | grep "\.go" | grep -v "third_party"); do
   diff="$(git show ":${file}" | gofmt -s -d)"
   if [[ -n "$diff" ]]; then
     echo "# *** ERROR: *** File ${file} has not been gofmt'd." >> $1

diff --git a/release/release.sh b/release/release.sh
@@ -40,7 +40,7 @@ mkdir -p $MASTER_RELEASE_DIR/third_party/go
 echo "Building release tree"
 cp release/master-release-install.sh $MASTER_RELEASE_DIR/src/scripts/master-release-install.sh
 cp -r cluster/saltbase $MASTER_RELEASE_DIR/src/saltbase
-cp -r third_party $MASTER_RELEASE_DIR/third_party/go/src
+cp -r third_party/src $MASTER_RELEASE_DIR/third_party/go/src
 
 function find_go_files() {
   find * -not \( \

diff --git a/...rty/bitbucket.org/kardianos/osext/LICENSE → ...src/bitbucket.org/kardianos/osext/LICENSE b/...rty/bitbucket.org/kardianos/osext/LICENSE → ...src/bitbucket.org/kardianos/osext/LICENSE
diff --git a/...ty/bitbucket.org/kardianos/osext/osext.go → ...rc/bitbucket.org/kardianos/osext/osext.go b/...ty/bitbucket.org/kardianos/osext/osext.go → ...rc/bitbucket.org/kardianos/osext/osext.go
diff --git a/...bucket.org/kardianos/osext/osext_plan9.go → ...bucket.org/kardianos/osext/osext_plan9.go b/...bucket.org/kardianos/osext/osext_plan9.go → ...bucket.org/kardianos/osext/osext_plan9.go
diff --git a/...ucket.org/kardianos/osext/osext_procfs.go → ...ucket.org/kardianos/osext/osext_procfs.go b/...ucket.org/kardianos/osext/osext_procfs.go → ...ucket.org/kardianos/osext/osext_procfs.go
diff --git a/...ucket.org/kardianos/osext/osext_sysctl.go → ...ucket.org/kardianos/osext/osext_sysctl.go b/...ucket.org/kardianos/osext/osext_sysctl.go → ...ucket.org/kardianos/osext/osext_sysctl.go
diff --git a/...tbucket.org/kardianos/osext/osext_test.go → ...tbucket.org/kardianos/osext/osext_test.go b/...tbucket.org/kardianos/osext/osext_test.go → ...tbucket.org/kardianos/osext/osext_test.go
diff --git a/...cket.org/kardianos/osext/osext_windows.go → ...cket.org/kardianos/osext/osext_windows.go b/...cket.org/kardianos/osext/osext_windows.go → ...cket.org/kardianos/osext/osext_windows.go
diff --git a/...d_party/github.com/coreos/go-etcd/LICENSE → ...rty/src/github.com/coreos/go-etcd/LICENSE b/...d_party/github.com/coreos/go-etcd/LICENSE → ...rty/src/github.com/coreos/go-etcd/LICENSE
diff --git a/...party/github.com/coreos/go-etcd/README.md → ...y/src/github.com/coreos/go-etcd/README.md b/...party/github.com/coreos/go-etcd/README.md → ...y/src/github.com/coreos/go-etcd/README.md
diff --git a/...thub.com/coreos/go-etcd/etcd/add_child.go → ...thub.com/coreos/go-etcd/etcd/add_child.go b/...thub.com/coreos/go-etcd/etcd/add_child.go → ...thub.com/coreos/go-etcd/etcd/add_child.go
diff --git a/...com/coreos/go-etcd/etcd/add_child_test.go → ...com/coreos/go-etcd/etcd/add_child_test.go b/...com/coreos/go-etcd/etcd/add_child_test.go → ...com/coreos/go-etcd/etcd/add_child_test.go
diff --git a/.../github.com/coreos/go-etcd/etcd/client.go → .../github.com/coreos/go-etcd/etcd/client.go b/.../github.com/coreos/go-etcd/etcd/client.go → .../github.com/coreos/go-etcd/etcd/client.go
diff --git a/...ub.com/coreos/go-etcd/etcd/client_test.go → ...ub.com/coreos/go-etcd/etcd/client_test.go b/...ub.com/coreos/go-etcd/etcd/client_test.go → ...ub.com/coreos/go-etcd/etcd/client_test.go
diff --git a/...github.com/coreos/go-etcd/etcd/cluster.go → ...github.com/coreos/go-etcd/etcd/cluster.go b/...github.com/coreos/go-etcd/etcd/cluster.go → ...github.com/coreos/go-etcd/etcd/cluster.go
diff --git a/...coreos/go-etcd/etcd/compare_and_delete.go → ...coreos/go-etcd/etcd/compare_and_delete.go b/...coreos/go-etcd/etcd/compare_and_delete.go → ...coreos/go-etcd/etcd/compare_and_delete.go
diff --git a/...s/go-etcd/etcd/compare_and_delete_test.go → ...s/go-etcd/etcd/compare_and_delete_test.go b/...s/go-etcd/etcd/compare_and_delete_test.go → ...s/go-etcd/etcd/compare_and_delete_test.go
diff --git a/...m/coreos/go-etcd/etcd/compare_and_swap.go → ...m/coreos/go-etcd/etcd/compare_and_swap.go b/...m/coreos/go-etcd/etcd/compare_and_swap.go → ...m/coreos/go-etcd/etcd/compare_and_swap.go
diff --git a/...eos/go-etcd/etcd/compare_and_swap_test.go → ...eos/go-etcd/etcd/compare_and_swap_test.go b/...eos/go-etcd/etcd/compare_and_swap_test.go → ...eos/go-etcd/etcd/compare_and_swap_test.go
diff --git a/...y/github.com/coreos/go-etcd/etcd/debug.go → ...c/github.com/coreos/go-etcd/etcd/debug.go b/...y/github.com/coreos/go-etcd/etcd/debug.go → ...c/github.com/coreos/go-etcd/etcd/debug.go
diff --git a/.../github.com/coreos/go-etcd/etcd/delete.go → .../github.com/coreos/go-etcd/etcd/delete.go b/.../github.com/coreos/go-etcd/etcd/delete.go → .../github.com/coreos/go-etcd/etcd/delete.go
diff --git a/...ub.com/coreos/go-etcd/etcd/delete_test.go → ...ub.com/coreos/go-etcd/etcd/delete_test.go b/...ub.com/coreos/go-etcd/etcd/delete_test.go → ...ub.com/coreos/go-etcd/etcd/delete_test.go
diff --git a/...y/github.com/coreos/go-etcd/etcd/error.go → ...c/github.com/coreos/go-etcd/etcd/error.go b/...y/github.com/coreos/go-etcd/etcd/error.go → ...c/github.com/coreos/go-etcd/etcd/error.go
diff --git a/...rty/github.com/coreos/go-etcd/etcd/get.go → ...src/github.com/coreos/go-etcd/etcd/get.go b/...rty/github.com/coreos/go-etcd/etcd/get.go → ...src/github.com/coreos/go-etcd/etcd/get.go
diff --git a/...ithub.com/coreos/go-etcd/etcd/get_test.go → ...ithub.com/coreos/go-etcd/etcd/get_test.go b/...ithub.com/coreos/go-etcd/etcd/get_test.go → ...ithub.com/coreos/go-etcd/etcd/get_test.go
diff --git a/...github.com/coreos/go-etcd/etcd/options.go → ...github.com/coreos/go-etcd/etcd/options.go b/...github.com/coreos/go-etcd/etcd/options.go → ...github.com/coreos/go-etcd/etcd/options.go
diff --git a/...ithub.com/coreos/go-etcd/etcd/requests.go → ...ithub.com/coreos/go-etcd/etcd/requests.go b/...ithub.com/coreos/go-etcd/etcd/requests.go → ...ithub.com/coreos/go-etcd/etcd/requests.go
diff --git a/...ithub.com/coreos/go-etcd/etcd/response.go → ...ithub.com/coreos/go-etcd/etcd/response.go b/...ithub.com/coreos/go-etcd/etcd/response.go → ...ithub.com/coreos/go-etcd/etcd/response.go
diff --git a/...coreos/go-etcd/etcd/set_curl_chan_test.go → ...coreos/go-etcd/etcd/set_curl_chan_test.go b/...coreos/go-etcd/etcd/set_curl_chan_test.go → ...coreos/go-etcd/etcd/set_curl_chan_test.go
diff --git a/.../coreos/go-etcd/etcd/set_update_create.go → .../coreos/go-etcd/etcd/set_update_create.go b/.../coreos/go-etcd/etcd/set_update_create.go → .../coreos/go-etcd/etcd/set_update_create.go
diff --git a/...os/go-etcd/etcd/set_update_create_test.go → ...os/go-etcd/etcd/set_update_create_test.go b/...os/go-etcd/etcd/set_update_create_test.go → ...os/go-etcd/etcd/set_update_create_test.go
diff --git a/...github.com/coreos/go-etcd/etcd/version.go → ...github.com/coreos/go-etcd/etcd/version.go b/...github.com/coreos/go-etcd/etcd/version.go → ...github.com/coreos/go-etcd/etcd/version.go
diff --git a/...y/github.com/coreos/go-etcd/etcd/watch.go → ...c/github.com/coreos/go-etcd/etcd/watch.go b/...y/github.com/coreos/go-etcd/etcd/watch.go → ...c/github.com/coreos/go-etcd/etcd/watch.go
diff --git a/...hub.com/coreos/go-etcd/etcd/watch_test.go → ...hub.com/coreos/go-etcd/etcd/watch_test.go b/...hub.com/coreos/go-etcd/etcd/watch_test.go → ...hub.com/coreos/go-etcd/etcd/watch_test.go
diff --git a/third_party/github.com/coreos/go-log/LICENSE → ...arty/src/github.com/coreos/go-log/LICENSE b/third_party/github.com/coreos/go-log/LICENSE → ...arty/src/github.com/coreos/go-log/LICENSE
diff --git a/..._party/github.com/coreos/go-log/README.md → ...ty/src/github.com/coreos/go-log/README.md b/..._party/github.com/coreos/go-log/README.md → ...ty/src/github.com/coreos/go-log/README.md
diff --git a/.../github.com/coreos/go-log/log/commands.go → .../github.com/coreos/go-log/log/commands.go b/.../github.com/coreos/go-log/log/commands.go → .../github.com/coreos/go-log/log/commands.go
diff --git a/...ty/github.com/coreos/go-log/log/fields.go → ...rc/github.com/coreos/go-log/log/fields.go b/...ty/github.com/coreos/go-log/log/fields.go → ...rc/github.com/coreos/go-log/log/fields.go
diff --git a/...ty/github.com/coreos/go-log/log/logger.go → ...rc/github.com/coreos/go-log/log/logger.go b/...ty/github.com/coreos/go-log/log/logger.go → ...rc/github.com/coreos/go-log/log/logger.go
diff --git a/.../github.com/coreos/go-log/log/priority.go → .../github.com/coreos/go-log/log/priority.go b/.../github.com/coreos/go-log/log/priority.go → .../github.com/coreos/go-log/log/priority.go
diff --git a/...rty/github.com/coreos/go-log/log/sinks.go → ...src/github.com/coreos/go-log/log/sinks.go b/...rty/github.com/coreos/go-log/log/sinks.go → ...src/github.com/coreos/go-log/log/sinks.go
diff --git a/...ithub.com/coreos/go-log/log/sinks_unix.go → ...ithub.com/coreos/go-log/log/sinks_unix.go b/...ithub.com/coreos/go-log/log/sinks_unix.go → ...ithub.com/coreos/go-log/log/sinks_unix.go
diff --git a/...ub.com/coreos/go-log/log/sinks_windows.go → ...ub.com/coreos/go-log/log/sinks_windows.go b/...ub.com/coreos/go-log/log/sinks_windows.go → ...ub.com/coreos/go-log/log/sinks_windows.go
diff --git a/...hub.com/coreos/go-systemd/journal/send.go → ...hub.com/coreos/go-systemd/journal/send.go b/...hub.com/coreos/go-systemd/journal/send.go → ...hub.com/coreos/go-systemd/journal/send.go
diff --git a/...ub.com/fsouza/go-dockerclient/.travis.yml → ...ub.com/fsouza/go-dockerclient/.travis.yml b/...ub.com/fsouza/go-dockerclient/.travis.yml → ...ub.com/fsouza/go-dockerclient/.travis.yml
diff --git a/...github.com/fsouza/go-dockerclient/AUTHORS → ...github.com/fsouza/go-dockerclient/AUTHORS b/...github.com/fsouza/go-dockerclient/AUTHORS → ...github.com/fsouza/go-dockerclient/AUTHORS
diff --git a/...com/fsouza/go-dockerclient/DOCKER-LICENSE → ...com/fsouza/go-dockerclient/DOCKER-LICENSE b/...com/fsouza/go-dockerclient/DOCKER-LICENSE → ...com/fsouza/go-dockerclient/DOCKER-LICENSE
diff --git a/...github.com/fsouza/go-dockerclient/LICENSE → ...github.com/fsouza/go-dockerclient/LICENSE b/...github.com/fsouza/go-dockerclient/LICENSE → ...github.com/fsouza/go-dockerclient/LICENSE
diff --git a/...om/fsouza/go-dockerclient/README.markdown → ...om/fsouza/go-dockerclient/README.markdown b/...om/fsouza/go-dockerclient/README.markdown → ...om/fsouza/go-dockerclient/README.markdown
diff --git a/...thub.com/fsouza/go-dockerclient/change.go → ...thub.com/fsouza/go-dockerclient/change.go b/...thub.com/fsouza/go-dockerclient/change.go → ...thub.com/fsouza/go-dockerclient/change.go
diff --git a/...com/fsouza/go-dockerclient/change_test.go → ...com/fsouza/go-dockerclient/change_test.go b/...com/fsouza/go-dockerclient/change_test.go → ...com/fsouza/go-dockerclient/change_test.go
diff --git a/...thub.com/fsouza/go-dockerclient/client.go → ...thub.com/fsouza/go-dockerclient/client.go b/...thub.com/fsouza/go-dockerclient/client.go → ...thub.com/fsouza/go-dockerclient/client.go
diff --git a/...com/fsouza/go-dockerclient/client_test.go → ...com/fsouza/go-dockerclient/client_test.go b/...com/fsouza/go-dockerclient/client_test.go → ...com/fsouza/go-dockerclient/client_test.go
diff --git a/...b.com/fsouza/go-dockerclient/container.go → ...b.com/fsouza/go-dockerclient/container.go b/...b.com/fsouza/go-dockerclient/container.go → ...b.com/fsouza/go-dockerclient/container.go
diff --git a/.../fsouza/go-dockerclient/container_test.go → .../fsouza/go-dockerclient/container_test.go b/.../fsouza/go-dockerclient/container_test.go → .../fsouza/go-dockerclient/container_test.go
diff --git a/...m/fsouza/go-dockerclient/engine/engine.go → ...m/fsouza/go-dockerclient/engine/engine.go b/...m/fsouza/go-dockerclient/engine/engine.go → ...m/fsouza/go-dockerclient/engine/engine.go
diff --git a/...uza/go-dockerclient/engine/engine_test.go → ...uza/go-dockerclient/engine/engine_test.go b/...uza/go-dockerclient/engine/engine_test.go → ...uza/go-dockerclient/engine/engine_test.go
diff --git a/....com/fsouza/go-dockerclient/engine/env.go → ....com/fsouza/go-dockerclient/engine/env.go b/....com/fsouza/go-dockerclient/engine/env.go → ....com/fsouza/go-dockerclient/engine/env.go
diff --git a/...fsouza/go-dockerclient/engine/env_test.go → ...fsouza/go-dockerclient/engine/env_test.go b/...fsouza/go-dockerclient/engine/env_test.go → ...fsouza/go-dockerclient/engine/env_test.go
diff --git a/...com/fsouza/go-dockerclient/engine/hack.go → ...com/fsouza/go-dockerclient/engine/hack.go b/...com/fsouza/go-dockerclient/engine/hack.go → ...com/fsouza/go-dockerclient/engine/hack.go
diff --git a/...za/go-dockerclient/engine/helpers_test.go → ...za/go-dockerclient/engine/helpers_test.go b/...za/go-dockerclient/engine/helpers_test.go → ...za/go-dockerclient/engine/helpers_test.go
diff --git a/...com/fsouza/go-dockerclient/engine/http.go → ...com/fsouza/go-dockerclient/engine/http.go b/...com/fsouza/go-dockerclient/engine/http.go → ...com/fsouza/go-dockerclient/engine/http.go
diff --git a/....com/fsouza/go-dockerclient/engine/job.go → ....com/fsouza/go-dockerclient/engine/job.go b/....com/fsouza/go-dockerclient/engine/job.go → ....com/fsouza/go-dockerclient/engine/job.go
diff --git a/...fsouza/go-dockerclient/engine/job_test.go → ...fsouza/go-dockerclient/engine/job_test.go b/...fsouza/go-dockerclient/engine/job_test.go → ...fsouza/go-dockerclient/engine/job_test.go
diff --git a/.../fsouza/go-dockerclient/engine/streams.go → .../fsouza/go-dockerclient/engine/streams.go b/.../fsouza/go-dockerclient/engine/streams.go → .../fsouza/go-dockerclient/engine/streams.go
diff --git a/...za/go-dockerclient/engine/streams_test.go → ...za/go-dockerclient/engine/streams_test.go b/...za/go-dockerclient/engine/streams_test.go → ...za/go-dockerclient/engine/streams_test.go
diff --git a/...ithub.com/fsouza/go-dockerclient/event.go → ...ithub.com/fsouza/go-dockerclient/event.go b/...ithub.com/fsouza/go-dockerclient/event.go → ...ithub.com/fsouza/go-dockerclient/event.go
diff --git a/....com/fsouza/go-dockerclient/event_test.go → ....com/fsouza/go-dockerclient/event_test.go b/....com/fsouza/go-dockerclient/event_test.go → ....com/fsouza/go-dockerclient/event_test.go
diff --git a/...om/fsouza/go-dockerclient/example_test.go → ...om/fsouza/go-dockerclient/example_test.go b/...om/fsouza/go-dockerclient/example_test.go → ...om/fsouza/go-dockerclient/example_test.go
diff --git a/...ithub.com/fsouza/go-dockerclient/image.go → ...ithub.com/fsouza/go-dockerclient/image.go b/...ithub.com/fsouza/go-dockerclient/image.go → ...ithub.com/fsouza/go-dockerclient/image.go
diff --git a/....com/fsouza/go-dockerclient/image_test.go → ....com/fsouza/go-dockerclient/image_test.go b/....com/fsouza/go-dockerclient/image_test.go → ....com/fsouza/go-dockerclient/image_test.go
diff --git a/...github.com/fsouza/go-dockerclient/misc.go → ...github.com/fsouza/go-dockerclient/misc.go b/...github.com/fsouza/go-dockerclient/misc.go → ...github.com/fsouza/go-dockerclient/misc.go
diff --git a/...b.com/fsouza/go-dockerclient/misc_test.go → ...b.com/fsouza/go-dockerclient/misc_test.go b/...b.com/fsouza/go-dockerclient/misc_test.go → ...b.com/fsouza/go-dockerclient/misc_test.go
diff --git a/...thub.com/fsouza/go-dockerclient/signal.go → ...thub.com/fsouza/go-dockerclient/signal.go b/...thub.com/fsouza/go-dockerclient/signal.go → ...thub.com/fsouza/go-dockerclient/signal.go
diff --git a/...a/go-dockerclient/testing/data/Dockerfile → ...a/go-dockerclient/testing/data/Dockerfile b/...a/go-dockerclient/testing/data/Dockerfile → ...a/go-dockerclient/testing/data/Dockerfile
diff --git a/...o-dockerclient/testing/data/container.tar → ...o-dockerclient/testing/data/container.tar b/...o-dockerclient/testing/data/container.tar → ...o-dockerclient/testing/data/container.tar
diff --git a/...-dockerclient/testing/data/dockerfile.tar → ...-dockerclient/testing/data/dockerfile.tar b/...-dockerclient/testing/data/dockerfile.tar → ...-dockerclient/testing/data/dockerfile.tar
diff --git a/.../fsouza/go-dockerclient/testing/server.go → .../fsouza/go-dockerclient/testing/server.go b/.../fsouza/go-dockerclient/testing/server.go → .../fsouza/go-dockerclient/testing/server.go
diff --git a/...za/go-dockerclient/testing/server_test.go → ...za/go-dockerclient/testing/server_test.go b/...za/go-dockerclient/testing/server_test.go → ...za/go-dockerclient/testing/server_test.go
diff --git a/...om/fsouza/go-dockerclient/utils/random.go → ...om/fsouza/go-dockerclient/utils/random.go b/...om/fsouza/go-dockerclient/utils/random.go → ...om/fsouza/go-dockerclient/utils/random.go
diff --git a/...m/fsouza/go-dockerclient/utils/stdcopy.go → ...m/fsouza/go-dockerclient/utils/stdcopy.go b/...m/fsouza/go-dockerclient/utils/stdcopy.go → ...m/fsouza/go-dockerclient/utils/stdcopy.go
diff --git a/...uza/go-dockerclient/utils/uname_darwin.go → ...uza/go-dockerclient/utils/uname_darwin.go b/...uza/go-dockerclient/utils/uname_darwin.go → ...uza/go-dockerclient/utils/uname_darwin.go
diff --git a/...ouza/go-dockerclient/utils/uname_linux.go → ...ouza/go-dockerclient/utils/uname_linux.go b/...ouza/go-dockerclient/utils/uname_linux.go → ...ouza/go-dockerclient/utils/uname_linux.go
diff --git a/...com/fsouza/go-dockerclient/utils/utils.go → ...com/fsouza/go-dockerclient/utils/utils.go b/...com/fsouza/go-dockerclient/utils/utils.go → ...com/fsouza/go-dockerclient/utils/utils.go
diff --git a/...souza/go-dockerclient/utils/utils_test.go → ...souza/go-dockerclient/utils/utils_test.go b/...souza/go-dockerclient/utils/utils_test.go → ...souza/go-dockerclient/utils/utils_test.go
diff --git a/...za/go-dockerclient/utils/utils_windows.go → ...za/go-dockerclient/utils/utils_windows.go b/...za/go-dockerclient/utils/utils_windows.go → ...za/go-dockerclient/utils/utils_windows.go
diff --git a/third_party/gonuts.org/v1/yaml/LICENSE → third_party/src/gonuts.org/v1/yaml/LICENSE b/third_party/gonuts.org/v1/yaml/LICENSE → third_party/src/gonuts.org/v1/yaml/LICENSE
diff --git a/..._party/gonuts.org/v1/yaml/LICENSE.libyaml → ...ty/src/gonuts.org/v1/yaml/LICENSE.libyaml b/..._party/gonuts.org/v1/yaml/LICENSE.libyaml → ...ty/src/gonuts.org/v1/yaml/LICENSE.libyaml
diff --git a/third_party/gonuts.org/v1/yaml/README.md → third_party/src/gonuts.org/v1/yaml/README.md b/third_party/gonuts.org/v1/yaml/README.md → third_party/src/gonuts.org/v1/yaml/README.md
diff --git a/third_party/gonuts.org/v1/yaml/apic.go → third_party/src/gonuts.org/v1/yaml/apic.go b/third_party/gonuts.org/v1/yaml/apic.go → third_party/src/gonuts.org/v1/yaml/apic.go
diff --git a/third_party/gonuts.org/v1/yaml/decode.go → third_party/src/gonuts.org/v1/yaml/decode.go b/third_party/gonuts.org/v1/yaml/decode.go → third_party/src/gonuts.org/v1/yaml/decode.go
diff --git a/...d_party/gonuts.org/v1/yaml/decode_test.go → ...rty/src/gonuts.org/v1/yaml/decode_test.go b/...d_party/gonuts.org/v1/yaml/decode_test.go → ...rty/src/gonuts.org/v1/yaml/decode_test.go
diff --git a/third_party/gonuts.org/v1/yaml/emitterc.go → ..._party/src/gonuts.org/v1/yaml/emitterc.go b/third_party/gonuts.org/v1/yaml/emitterc.go → ..._party/src/gonuts.org/v1/yaml/emitterc.go
diff --git a/third_party/gonuts.org/v1/yaml/encode.go → third_party/src/gonuts.org/v1/yaml/encode.go b/third_party/gonuts.org/v1/yaml/encode.go → third_party/src/gonuts.org/v1/yaml/encode.go
diff --git a/...d_party/gonuts.org/v1/yaml/encode_test.go → ...rty/src/gonuts.org/v1/yaml/encode_test.go b/...d_party/gonuts.org/v1/yaml/encode_test.go → ...rty/src/gonuts.org/v1/yaml/encode_test.go
diff --git a/third_party/gonuts.org/v1/yaml/parserc.go → ...d_party/src/gonuts.org/v1/yaml/parserc.go b/third_party/gonuts.org/v1/yaml/parserc.go → ...d_party/src/gonuts.org/v1/yaml/parserc.go
diff --git a/third_party/gonuts.org/v1/yaml/readerc.go → ...d_party/src/gonuts.org/v1/yaml/readerc.go b/third_party/gonuts.org/v1/yaml/readerc.go → ...d_party/src/gonuts.org/v1/yaml/readerc.go
diff --git a/third_party/gonuts.org/v1/yaml/resolve.go → ...d_party/src/gonuts.org/v1/yaml/resolve.go b/third_party/gonuts.org/v1/yaml/resolve.go → ...d_party/src/gonuts.org/v1/yaml/resolve.go
diff --git a/third_party/gonuts.org/v1/yaml/scannerc.go → ..._party/src/gonuts.org/v1/yaml/scannerc.go b/third_party/gonuts.org/v1/yaml/scannerc.go → ..._party/src/gonuts.org/v1/yaml/scannerc.go
diff --git a/third_party/gonuts.org/v1/yaml/sorter.go → third_party/src/gonuts.org/v1/yaml/sorter.go b/third_party/gonuts.org/v1/yaml/sorter.go → third_party/src/gonuts.org/v1/yaml/sorter.go
diff --git a/third_party/gonuts.org/v1/yaml/suite_test.go → ...arty/src/gonuts.org/v1/yaml/suite_test.go b/third_party/gonuts.org/v1/yaml/suite_test.go → ...arty/src/gonuts.org/v1/yaml/suite_test.go
diff --git a/third_party/gonuts.org/v1/yaml/writerc.go → ...d_party/src/gonuts.org/v1/yaml/writerc.go b/third_party/gonuts.org/v1/yaml/writerc.go → ...d_party/src/gonuts.org/v1/yaml/writerc.go
diff --git a/third_party/gonuts.org/v1/yaml/yaml.go → third_party/src/gonuts.org/v1/yaml/yaml.go b/third_party/gonuts.org/v1/yaml/yaml.go → third_party/src/gonuts.org/v1/yaml/yaml.go
diff --git a/third_party/gonuts.org/v1/yaml/yamlh.go → third_party/src/gonuts.org/v1/yaml/yamlh.go b/third_party/gonuts.org/v1/yaml/yamlh.go → third_party/src/gonuts.org/v1/yaml/yamlh.go
diff --git a/..._party/gonuts.org/v1/yaml/yamlprivateh.go → ...ty/src/gonuts.org/v1/yaml/yamlprivateh.go b/..._party/gonuts.org/v1/yaml/yamlprivateh.go → ...ty/src/gonuts.org/v1/yaml/yamlprivateh.go
diff --git a/third_party/gopkg.in/v1/yaml/LICENSE → third_party/src/gopkg.in/v1/yaml/LICENSE b/third_party/gopkg.in/v1/yaml/LICENSE → third_party/src/gopkg.in/v1/yaml/LICENSE
diff --git a/third_party/gopkg.in/v1/yaml/LICENSE.libyaml → ...arty/src/gopkg.in/v1/yaml/LICENSE.libyaml b/third_party/gopkg.in/v1/yaml/LICENSE.libyaml → ...arty/src/gopkg.in/v1/yaml/LICENSE.libyaml
diff --git a/third_party/gopkg.in/v1/yaml/README.md → third_party/src/gopkg.in/v1/yaml/README.md b/third_party/gopkg.in/v1/yaml/README.md → third_party/src/gopkg.in/v1/yaml/README.md
diff --git a/third_party/gopkg.in/v1/yaml/apic.go → third_party/src/gopkg.in/v1/yaml/apic.go b/third_party/gopkg.in/v1/yaml/apic.go → third_party/src/gopkg.in/v1/yaml/apic.go
diff --git a/third_party/gopkg.in/v1/yaml/decode.go → third_party/src/gopkg.in/v1/yaml/decode.go b/third_party/gopkg.in/v1/yaml/decode.go → third_party/src/gopkg.in/v1/yaml/decode.go
diff --git a/third_party/gopkg.in/v1/yaml/decode_test.go → ...party/src/gopkg.in/v1/yaml/decode_test.go b/third_party/gopkg.in/v1/yaml/decode_test.go → ...party/src/gopkg.in/v1/yaml/decode_test.go
diff --git a/third_party/gopkg.in/v1/yaml/emitterc.go → third_party/src/gopkg.in/v1/yaml/emitterc.go b/third_party/gopkg.in/v1/yaml/emitterc.go → third_party/src/gopkg.in/v1/yaml/emitterc.go
diff --git a/third_party/gopkg.in/v1/yaml/encode.go → third_party/src/gopkg.in/v1/yaml/encode.go b/third_party/gopkg.in/v1/yaml/encode.go → third_party/src/gopkg.in/v1/yaml/encode.go
diff --git a/third_party/gopkg.in/v1/yaml/encode_test.go → ...party/src/gopkg.in/v1/yaml/encode_test.go b/third_party/gopkg.in/v1/yaml/encode_test.go → ...party/src/gopkg.in/v1/yaml/encode_test.go
diff --git a/third_party/gopkg.in/v1/yaml/parserc.go → third_party/src/gopkg.in/v1/yaml/parserc.go b/third_party/gopkg.in/v1/yaml/parserc.go → third_party/src/gopkg.in/v1/yaml/parserc.go
diff --git a/third_party/gopkg.in/v1/yaml/readerc.go → third_party/src/gopkg.in/v1/yaml/readerc.go b/third_party/gopkg.in/v1/yaml/readerc.go → third_party/src/gopkg.in/v1/yaml/readerc.go
diff --git a/third_party/gopkg.in/v1/yaml/resolve.go → third_party/src/gopkg.in/v1/yaml/resolve.go b/third_party/gopkg.in/v1/yaml/resolve.go → third_party/src/gopkg.in/v1/yaml/resolve.go
diff --git a/third_party/gopkg.in/v1/yaml/scannerc.go → third_party/src/gopkg.in/v1/yaml/scannerc.go b/third_party/gopkg.in/v1/yaml/scannerc.go → third_party/src/gopkg.in/v1/yaml/scannerc.go
diff --git a/third_party/gopkg.in/v1/yaml/sorter.go → third_party/src/gopkg.in/v1/yaml/sorter.go b/third_party/gopkg.in/v1/yaml/sorter.go → third_party/src/gopkg.in/v1/yaml/sorter.go
diff --git a/third_party/gopkg.in/v1/yaml/suite_test.go → ..._party/src/gopkg.in/v1/yaml/suite_test.go b/third_party/gopkg.in/v1/yaml/suite_test.go → ..._party/src/gopkg.in/v1/yaml/suite_test.go
diff --git a/third_party/gopkg.in/v1/yaml/writerc.go → third_party/src/gopkg.in/v1/yaml/writerc.go b/third_party/gopkg.in/v1/yaml/writerc.go → third_party/src/gopkg.in/v1/yaml/writerc.go
diff --git a/third_party/gopkg.in/v1/yaml/yaml.go → third_party/src/gopkg.in/v1/yaml/yaml.go b/third_party/gopkg.in/v1/yaml/yaml.go → third_party/src/gopkg.in/v1/yaml/yaml.go
diff --git a/third_party/gopkg.in/v1/yaml/yamlh.go → third_party/src/gopkg.in/v1/yaml/yamlh.go b/third_party/gopkg.in/v1/yaml/yamlh.go → third_party/src/gopkg.in/v1/yaml/yamlh.go
diff --git a/third_party/gopkg.in/v1/yaml/yamlprivateh.go → ...arty/src/gopkg.in/v1/yaml/yamlprivateh.go b/third_party/gopkg.in/v1/yaml/yamlprivateh.go → ...arty/src/gopkg.in/v1/yaml/yamlprivateh.go
diff --git a/third_party/update.sh b/third_party/update.sh
@@ -14,8 +14,8 @@ cd $THIRD_PARTY_DIR
 . ./deps.sh
 
 # Create a temp GOPATH root.  It must be an absolute path
-mkdir -p ../target/go_dep_update
-cd ../target/go_dep_update
+mkdir -p ../output/go_dep_update
+cd ../output/go_dep_update
 TMP_GO_ROOT=$PWD
 cd -
 export GOPATH=${TMP_GO_ROOT}
@@ -50,10 +50,10 @@ for p in $PACKAGES; do
   cd -
 
   # Copy the code into the final directory
-  rsync -a -z -r --exclude '.git/' --exclude '.hg/' $TMP_GO_ROOT/src/$p/ $p
+  rsync -a -z -r --exclude '.git/' --exclude '.hg/' $TMP_GO_ROOT/src/$p/ src/$p
 
   # Make a nice commit about what everything bumped to
-  git add $p
+  git add src/$p
   if ! git diff --cached --exit-code > /dev/null 2>&1; then
     git commit -m "bump($p): $HEAD"
   fi