From 9fdd2c010d0600a2976b253d5fd32b2524029e9c Mon Sep 17 00:00:00 2001 From: Wilson Carey Date: Tue, 10 May 2016 13:55:41 -0400 Subject: [PATCH 1/2] Update dependencies for Go 1.6 --- Godeps/Godeps.json | 43 ++++++----- Godeps/_workspace/.gitignore | 2 - .../github.com/hashicorp/errwrap/LICENSE | 0 .../github.com/hashicorp/errwrap/README.md | 0 .../github.com/hashicorp/errwrap/errwrap.go | 0 .../hashicorp/go-multierror/LICENSE | 0 .../hashicorp/go-multierror/README.md | 0 .../hashicorp/go-multierror/append.go | 0 .../hashicorp/go-multierror/flatten.go | 0 .../hashicorp/go-multierror/format.go | 0 .../hashicorp/go-multierror/multierror.go | 0 .../hashicorp/go-multierror/prefix.go | 0 .../hashicorp/go-version/.travis.yml | 0 .../github.com/hashicorp/go-version/LICENSE | 0 .../github.com/hashicorp/go-version/README.md | 0 .../hashicorp/go-version/constraint.go | 0 .../hashicorp/go-version/version.go | 0 .../go-version/version_collection.go | 0 .../github.com/hashicorp/yamux/.gitignore | 0 .../github.com/hashicorp/yamux/LICENSE | 0 .../github.com/hashicorp/yamux/README.md | 0 .../github.com/hashicorp/yamux/addr.go | 0 .../github.com/hashicorp/yamux/const.go | 0 .../github.com/hashicorp/yamux/mux.go | 0 .../github.com/hashicorp/yamux/session.go | 0 .../github.com/hashicorp/yamux/spec.md | 2 +- .../github.com/hashicorp/yamux/stream.go | 0 .../github.com/hashicorp/yamux/util.go | 0 .../github.com/mitchellh/go-fs/LICENSE | 0 .../github.com/mitchellh/go-fs/README.md | 0 .../mitchellh/go-fs/block_device.go | 0 .../github.com/mitchellh/go-fs/directory.go | 0 .../mitchellh/go-fs/fat/boot_sector.go | 0 .../mitchellh/go-fs/fat/cluster_chain.go | 0 .../mitchellh/go-fs/fat/directory.go | 0 .../mitchellh/go-fs/fat/directory_cluster.go | 0 .../github.com/mitchellh/go-fs/fat/fat.go | 0 .../github.com/mitchellh/go-fs/fat/file.go | 0 .../mitchellh/go-fs/fat/filesystem.go | 0 .../mitchellh/go-fs/fat/short_name.go | 0 .../mitchellh/go-fs/fat/super_floppy.go | 0 .../github.com/mitchellh/go-fs/fat/type.go | 0 .../github.com/mitchellh/go-fs/file.go | 0 .../github.com/mitchellh/go-fs/file_disk.go | 0 .../github.com/mitchellh/go-fs/filesystem.go | 0 .../github.com/mitchellh/iochan/LICENSE.md | 0 .../github.com/mitchellh/iochan/README.md | 0 .../github.com/mitchellh/iochan/iochan.go | 0 .../mitchellh/mapstructure/.travis.yml | 0 .../github.com/mitchellh/mapstructure/LICENSE | 0 .../mitchellh/mapstructure/README.md | 0 .../mitchellh/mapstructure/decode_hooks.go | 0 .../mitchellh/mapstructure/error.go | 0 .../mitchellh/mapstructure/mapstructure.go | 0 .../github.com/mitchellh/multistep/LICENSE.md | 0 .../github.com/mitchellh/multistep/README.md | 0 .../mitchellh/multistep/basic_runner.go | 0 .../mitchellh/multistep/debug_runner.go | 0 .../mitchellh/multistep/multistep.go | 0 .../mitchellh/multistep/statebag.go | 0 .../github.com/mitchellh/packer/LICENSE | 0 .../mitchellh/packer/common/config.go | 0 .../mitchellh/packer/common/download.go | 0 .../mitchellh/packer/common/http_config.go | 0 .../mitchellh/packer/common/iso_config.go | 0 .../packer/common/multistep_debug.go | 0 .../mitchellh/packer/common/packer_config.go | 0 .../packer/common/step_create_floppy.go | 0 .../mitchellh/packer/common/step_download.go | 0 .../packer/common/step_http_server.go | 0 .../mitchellh/packer/common/step_provision.go | 0 .../mitchellh/packer/common/uuid/uuid.go | 0 .../mitchellh/packer/helper/config/decode.go | 0 .../mitchellh/packer/packer/artifact.go | 0 .../mitchellh/packer/packer/artifact_mock.go | 0 .../mitchellh/packer/packer/build.go | 0 .../mitchellh/packer/packer/builder.go | 0 .../mitchellh/packer/packer/builder_mock.go | 0 .../mitchellh/packer/packer/cache.go | 0 .../mitchellh/packer/packer/communicator.go | 0 .../packer/packer/communicator_mock.go | 0 .../mitchellh/packer/packer/config_file.go | 0 .../packer/packer/config_file_unix.go | 0 .../packer/packer/config_file_windows.go | 0 .../mitchellh/packer/packer/core.go | 0 .../mitchellh/packer/packer/hook.go | 0 .../mitchellh/packer/packer/hook_mock.go | 0 .../mitchellh/packer/packer/multi_error.go | 0 .../mitchellh/packer/packer/plugin/builder.go | 0 .../mitchellh/packer/packer/plugin/client.go | 0 .../mitchellh/packer/packer/plugin/hook.go | 0 .../packer/packer/plugin/post_processor.go | 0 .../packer/packer/plugin/provisioner.go | 0 .../mitchellh/packer/packer/plugin/server.go | 0 .../mitchellh/packer/packer/post_processor.go | 0 .../packer/packer/post_processor_mock.go | 0 .../mitchellh/packer/packer/provisioner.go | 0 .../packer/packer/provisioner_mock.go | 0 .../mitchellh/packer/packer/rpc/artifact.go | 0 .../mitchellh/packer/packer/rpc/build.go | 0 .../mitchellh/packer/packer/rpc/builder.go | 0 .../mitchellh/packer/packer/rpc/cache.go | 0 .../mitchellh/packer/packer/rpc/client.go | 0 .../packer/packer/rpc/communicator.go | 0 .../mitchellh/packer/packer/rpc/dial.go | 0 .../mitchellh/packer/packer/rpc/error.go | 0 .../mitchellh/packer/packer/rpc/hook.go | 0 .../mitchellh/packer/packer/rpc/init.go | 0 .../mitchellh/packer/packer/rpc/mux_broker.go | 0 .../packer/packer/rpc/post_processor.go | 0 .../packer/packer/rpc/provisioner.go | 0 .../mitchellh/packer/packer/rpc/server.go | 0 .../mitchellh/packer/packer/rpc/ui.go | 0 .../mitchellh/packer/packer/testing.go | 0 .../github.com/mitchellh/packer/packer/ui.go | 0 .../packer/template/interpolate/funcs.go | 0 .../packer/template/interpolate/i.go | 0 .../packer/template/interpolate/parse.go | 0 .../packer/template/interpolate/render.go | 0 .../mitchellh/packer/template/parse.go | 0 .../mitchellh/packer/template/template.go | 0 .../github.com/mitchellh/reflectwalk/LICENSE | 0 .../mitchellh/reflectwalk/README.md | 0 .../mitchellh/reflectwalk/location.go | 0 .../mitchellh/reflectwalk/location_string.go | 0 .../mitchellh/reflectwalk/reflectwalk.go | 0 .../github.com/ugorji/go/LICENSE | 0 .../github.com/ugorji/go/codec/0doc.go | 0 .../github.com/ugorji/go/codec/README.md | 0 .../github.com/ugorji/go/codec/binc.go | 0 .../github.com/ugorji/go/codec/cbor.go | 0 .../github.com/ugorji/go/codec/decode.go | 0 .../github.com/ugorji/go/codec/encode.go | 0 .../ugorji/go/codec/fast-path.generated.go | 0 .../ugorji/go/codec/fast-path.go.tmpl | 0 .../ugorji/go/codec/fast-path.not.go | 0 .../ugorji/go/codec/gen-dec-array.go.tmpl | 0 .../ugorji/go/codec/gen-dec-map.go.tmpl | 0 .../ugorji/go/codec/gen-helper.generated.go | 0 .../ugorji/go/codec/gen-helper.go.tmpl | 0 .../ugorji/go/codec/gen.generated.go | 0 .../github.com/ugorji/go/codec/gen.go | 8 +- vendor/github.com/ugorji/go/codec/gen_15.go | 12 +++ vendor/github.com/ugorji/go/codec/gen_16.go | 12 +++ .../github.com/ugorji/go/codec/helper.go | 0 .../ugorji/go/codec/helper_internal.go | 0 .../ugorji/go/codec/helper_not_unsafe.go | 0 .../ugorji/go/codec/helper_unsafe.go | 0 .../github.com/ugorji/go/codec/json.go | 0 .../github.com/ugorji/go/codec/msgpack.go | 0 .../github.com/ugorji/go/codec/noop.go | 0 .../github.com/ugorji/go/codec/prebuild.go | 0 .../github.com/ugorji/go/codec/prebuild.sh | 0 .../github.com/ugorji/go/codec/rpc.go | 0 .../github.com/ugorji/go/codec/simple.go | 0 .../ugorji/go/codec/test-cbor-goldens.json | 0 .../github.com/ugorji/go/codec/test.py | 0 .../github.com/ugorji/go/codec/tests.sh | 0 .../github.com/ugorji/go/codec/time.go | 0 .../golang.org/x/crypto/LICENSE | 0 .../golang.org/x/crypto/PATENTS | 0 .../x/crypto/curve25519/const_amd64.s | 0 .../x/crypto/curve25519/cswap_amd64.s | 0 .../x/crypto/curve25519/curve25519.go | 0 .../golang.org/x/crypto/curve25519/doc.go | 0 .../x/crypto/curve25519/freeze_amd64.s | 0 .../x/crypto/curve25519/ladderstep_amd64.s | 0 .../x/crypto/curve25519/mont25519_amd64.go | 0 .../x/crypto/curve25519/mul_amd64.s | 0 .../x/crypto/curve25519/square_amd64.s | 0 .../golang.org/x/crypto/ssh/buffer.go | 0 .../golang.org/x/crypto/ssh/certs.go | 0 .../golang.org/x/crypto/ssh/channel.go | 4 +- .../golang.org/x/crypto/ssh/cipher.go | 0 .../golang.org/x/crypto/ssh/client.go | 10 ++- .../golang.org/x/crypto/ssh/client_auth.go | 2 - .../golang.org/x/crypto/ssh/common.go | 0 .../golang.org/x/crypto/ssh/connection.go | 0 .../golang.org/x/crypto/ssh/doc.go | 0 .../golang.org/x/crypto/ssh/handshake.go | 70 ++++++++++------- .../golang.org/x/crypto/ssh/kex.go | 2 +- .../golang.org/x/crypto/ssh/keys.go | 6 ++ .../golang.org/x/crypto/ssh/mac.go | 0 .../golang.org/x/crypto/ssh/messages.go | 77 +++++++++++++------ .../golang.org/x/crypto/ssh/mux.go | 29 +------ .../golang.org/x/crypto/ssh/server.go | 2 +- .../golang.org/x/crypto/ssh/session.go | 9 ++- .../golang.org/x/crypto/ssh/tcpip.go | 0 .../golang.org/x/crypto/ssh/transport.go | 46 +++++------ 189 files changed, 196 insertions(+), 140 deletions(-) delete mode 100644 Godeps/_workspace/.gitignore rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/errwrap/LICENSE (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/errwrap/README.md (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/errwrap/errwrap.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/go-multierror/LICENSE (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/go-multierror/README.md (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/go-multierror/append.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/go-multierror/flatten.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/go-multierror/format.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/go-multierror/multierror.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/go-multierror/prefix.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/go-version/.travis.yml (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/go-version/LICENSE (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/go-version/README.md (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/go-version/constraint.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/go-version/version.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/go-version/version_collection.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/yamux/.gitignore (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/yamux/LICENSE (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/yamux/README.md (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/yamux/addr.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/yamux/const.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/yamux/mux.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/yamux/session.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/yamux/spec.md (98%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/yamux/stream.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/hashicorp/yamux/util.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/go-fs/LICENSE (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/go-fs/README.md (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/go-fs/block_device.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/go-fs/directory.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/go-fs/fat/boot_sector.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/go-fs/fat/cluster_chain.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/go-fs/fat/directory.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/go-fs/fat/directory_cluster.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/go-fs/fat/fat.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/go-fs/fat/file.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/go-fs/fat/filesystem.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/go-fs/fat/short_name.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/go-fs/fat/super_floppy.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/go-fs/fat/type.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/go-fs/file.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/go-fs/file_disk.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/go-fs/filesystem.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/iochan/LICENSE.md (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/iochan/README.md (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/iochan/iochan.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/mapstructure/.travis.yml (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/mapstructure/LICENSE (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/mapstructure/README.md (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/mapstructure/decode_hooks.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/mapstructure/error.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/mapstructure/mapstructure.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/multistep/LICENSE.md (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/multistep/README.md (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/multistep/basic_runner.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/multistep/debug_runner.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/multistep/multistep.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/multistep/statebag.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/LICENSE (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/common/config.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/common/download.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/common/http_config.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/common/iso_config.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/common/multistep_debug.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/common/packer_config.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/common/step_create_floppy.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/common/step_download.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/common/step_http_server.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/common/step_provision.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/common/uuid/uuid.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/helper/config/decode.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/artifact.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/artifact_mock.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/build.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/builder.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/builder_mock.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/cache.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/communicator.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/communicator_mock.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/config_file.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/config_file_unix.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/config_file_windows.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/core.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/hook.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/hook_mock.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/multi_error.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/plugin/builder.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/plugin/client.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/plugin/hook.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/plugin/post_processor.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/plugin/provisioner.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/plugin/server.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/post_processor.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/post_processor_mock.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/provisioner.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/provisioner_mock.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/rpc/artifact.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/rpc/build.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/rpc/builder.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/rpc/cache.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/rpc/client.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/rpc/communicator.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/rpc/dial.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/rpc/error.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/rpc/hook.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/rpc/init.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/rpc/mux_broker.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/rpc/post_processor.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/rpc/provisioner.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/rpc/server.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/rpc/ui.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/testing.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/packer/ui.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/template/interpolate/funcs.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/template/interpolate/i.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/template/interpolate/parse.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/template/interpolate/render.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/template/parse.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/packer/template/template.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/reflectwalk/LICENSE (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/reflectwalk/README.md (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/reflectwalk/location.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/reflectwalk/location_string.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/mitchellh/reflectwalk/reflectwalk.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/LICENSE (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/0doc.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/README.md (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/binc.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/cbor.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/decode.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/encode.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/fast-path.generated.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/fast-path.go.tmpl (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/fast-path.not.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/gen-dec-array.go.tmpl (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/gen-dec-map.go.tmpl (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/gen-helper.generated.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/gen-helper.go.tmpl (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/gen.generated.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/gen.go (99%) create mode 100644 vendor/github.com/ugorji/go/codec/gen_15.go create mode 100644 vendor/github.com/ugorji/go/codec/gen_16.go rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/helper.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/helper_internal.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/helper_not_unsafe.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/helper_unsafe.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/json.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/msgpack.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/noop.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/prebuild.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/prebuild.sh (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/rpc.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/simple.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/test-cbor-goldens.json (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/test.py (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/tests.sh (100%) rename {Godeps/_workspace/src => vendor}/github.com/ugorji/go/codec/time.go (100%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/LICENSE (100%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/PATENTS (100%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/curve25519/const_amd64.s (100%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/curve25519/cswap_amd64.s (100%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/curve25519/curve25519.go (100%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/curve25519/doc.go (100%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/curve25519/freeze_amd64.s (100%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/curve25519/ladderstep_amd64.s (100%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/curve25519/mont25519_amd64.go (100%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/curve25519/mul_amd64.s (100%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/curve25519/square_amd64.s (100%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/ssh/buffer.go (100%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/ssh/certs.go (100%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/ssh/channel.go (99%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/ssh/cipher.go (100%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/ssh/client.go (95%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/ssh/client_auth.go (99%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/ssh/common.go (100%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/ssh/connection.go (100%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/ssh/doc.go (100%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/ssh/handshake.go (87%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/ssh/kex.go (99%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/ssh/keys.go (98%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/ssh/mac.go (100%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/ssh/messages.go (90%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/ssh/mux.go (92%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/ssh/server.go (99%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/ssh/session.go (98%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/ssh/tcpip.go (100%) rename {Godeps/_workspace/src => vendor}/golang.org/x/crypto/ssh/transport.go (92%) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 7ab6494..52a84ba 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,6 +1,7 @@ { "ImportPath": "github.com/unifio/packer-provisioner-serverspec", - "GoVersion": "go1.5", + "GoVersion": "go1.6", + "GodepVersion": "v62", "Deps": [ { "ImportPath": "github.com/hashicorp/errwrap", @@ -16,7 +17,7 @@ }, { "ImportPath": "github.com/hashicorp/yamux", - "Rev": "df949784da9ed028ee76df44652e42d37a09d7e4" + "Rev": "c8a8a076e0858546ae6e2ee189d94e78b9b881ce" }, { "ImportPath": "github.com/mitchellh/go-fs", @@ -40,43 +41,43 @@ }, { "ImportPath": "github.com/mitchellh/packer/common", - "Comment": "v0.9.0", - "Rev": "a643faae672ec8b8424352476d2b91b7a7f7b06e" + "Comment": "v0.10.1", + "Rev": "4e5f65131b5491ab44ff8aa0626abe4a85597ac0" }, { "ImportPath": "github.com/mitchellh/packer/common/uuid", - "Comment": "v0.9.0", - "Rev": "a643faae672ec8b8424352476d2b91b7a7f7b06e" + "Comment": "v0.10.1", + "Rev": "4e5f65131b5491ab44ff8aa0626abe4a85597ac0" }, { "ImportPath": "github.com/mitchellh/packer/helper/config", - "Comment": "v0.9.0", - "Rev": "a643faae672ec8b8424352476d2b91b7a7f7b06e" + "Comment": "v0.10.1", + "Rev": "4e5f65131b5491ab44ff8aa0626abe4a85597ac0" }, { "ImportPath": "github.com/mitchellh/packer/packer", - "Comment": "v0.9.0", - "Rev": "a643faae672ec8b8424352476d2b91b7a7f7b06e" + "Comment": "v0.10.1", + "Rev": "4e5f65131b5491ab44ff8aa0626abe4a85597ac0" }, { "ImportPath": "github.com/mitchellh/packer/packer/plugin", - "Comment": "v0.9.0", - "Rev": "a643faae672ec8b8424352476d2b91b7a7f7b06e" + "Comment": "v0.10.1", + "Rev": "4e5f65131b5491ab44ff8aa0626abe4a85597ac0" }, { "ImportPath": "github.com/mitchellh/packer/packer/rpc", - "Comment": "v0.9.0", - "Rev": "a643faae672ec8b8424352476d2b91b7a7f7b06e" + "Comment": "v0.10.1", + "Rev": "4e5f65131b5491ab44ff8aa0626abe4a85597ac0" }, { "ImportPath": "github.com/mitchellh/packer/template", - "Comment": "v0.9.0", - "Rev": "a643faae672ec8b8424352476d2b91b7a7f7b06e" + "Comment": "v0.10.1", + "Rev": "4e5f65131b5491ab44ff8aa0626abe4a85597ac0" }, { "ImportPath": "github.com/mitchellh/packer/template/interpolate", - "Comment": "v0.9.0", - "Rev": "a643faae672ec8b8424352476d2b91b7a7f7b06e" + "Comment": "v0.10.1", + "Rev": "4e5f65131b5491ab44ff8aa0626abe4a85597ac0" }, { "ImportPath": "github.com/mitchellh/reflectwalk", @@ -84,15 +85,15 @@ }, { "ImportPath": "github.com/ugorji/go/codec", - "Rev": "187fa0f8af224437e08ecb3f208c4d1a94859a61" + "Rev": "a396ed22fc049df733440d90efe17475e3929ccb" }, { "ImportPath": "golang.org/x/crypto/curve25519", - "Rev": "de93d05161db39bcbd84d3da2e54c4a18f37f0b1" + "Rev": "285fb2ed20d1dc450fc743a1b3ff7c36bef372b9" }, { "ImportPath": "golang.org/x/crypto/ssh", - "Rev": "de93d05161db39bcbd84d3da2e54c4a18f37f0b1" + "Rev": "285fb2ed20d1dc450fc743a1b3ff7c36bef372b9" } ] } diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore deleted file mode 100644 index f037d68..0000000 --- a/Godeps/_workspace/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/pkg -/bin diff --git a/Godeps/_workspace/src/github.com/hashicorp/errwrap/LICENSE b/vendor/github.com/hashicorp/errwrap/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/errwrap/LICENSE rename to vendor/github.com/hashicorp/errwrap/LICENSE diff --git a/Godeps/_workspace/src/github.com/hashicorp/errwrap/README.md b/vendor/github.com/hashicorp/errwrap/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/errwrap/README.md rename to vendor/github.com/hashicorp/errwrap/README.md diff --git a/Godeps/_workspace/src/github.com/hashicorp/errwrap/errwrap.go b/vendor/github.com/hashicorp/errwrap/errwrap.go similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/errwrap/errwrap.go rename to vendor/github.com/hashicorp/errwrap/errwrap.go diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-multierror/LICENSE b/vendor/github.com/hashicorp/go-multierror/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/go-multierror/LICENSE rename to vendor/github.com/hashicorp/go-multierror/LICENSE diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-multierror/README.md b/vendor/github.com/hashicorp/go-multierror/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/go-multierror/README.md rename to vendor/github.com/hashicorp/go-multierror/README.md diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-multierror/append.go b/vendor/github.com/hashicorp/go-multierror/append.go similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/go-multierror/append.go rename to vendor/github.com/hashicorp/go-multierror/append.go diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-multierror/flatten.go b/vendor/github.com/hashicorp/go-multierror/flatten.go similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/go-multierror/flatten.go rename to vendor/github.com/hashicorp/go-multierror/flatten.go diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-multierror/format.go b/vendor/github.com/hashicorp/go-multierror/format.go similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/go-multierror/format.go rename to vendor/github.com/hashicorp/go-multierror/format.go diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-multierror/multierror.go b/vendor/github.com/hashicorp/go-multierror/multierror.go similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/go-multierror/multierror.go rename to vendor/github.com/hashicorp/go-multierror/multierror.go diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-multierror/prefix.go b/vendor/github.com/hashicorp/go-multierror/prefix.go similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/go-multierror/prefix.go rename to vendor/github.com/hashicorp/go-multierror/prefix.go diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-version/.travis.yml b/vendor/github.com/hashicorp/go-version/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/go-version/.travis.yml rename to vendor/github.com/hashicorp/go-version/.travis.yml diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-version/LICENSE b/vendor/github.com/hashicorp/go-version/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/go-version/LICENSE rename to vendor/github.com/hashicorp/go-version/LICENSE diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-version/README.md b/vendor/github.com/hashicorp/go-version/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/go-version/README.md rename to vendor/github.com/hashicorp/go-version/README.md diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-version/constraint.go b/vendor/github.com/hashicorp/go-version/constraint.go similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/go-version/constraint.go rename to vendor/github.com/hashicorp/go-version/constraint.go diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-version/version.go b/vendor/github.com/hashicorp/go-version/version.go similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/go-version/version.go rename to vendor/github.com/hashicorp/go-version/version.go diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-version/version_collection.go b/vendor/github.com/hashicorp/go-version/version_collection.go similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/go-version/version_collection.go rename to vendor/github.com/hashicorp/go-version/version_collection.go diff --git a/Godeps/_workspace/src/github.com/hashicorp/yamux/.gitignore b/vendor/github.com/hashicorp/yamux/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/yamux/.gitignore rename to vendor/github.com/hashicorp/yamux/.gitignore diff --git a/Godeps/_workspace/src/github.com/hashicorp/yamux/LICENSE b/vendor/github.com/hashicorp/yamux/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/yamux/LICENSE rename to vendor/github.com/hashicorp/yamux/LICENSE diff --git a/Godeps/_workspace/src/github.com/hashicorp/yamux/README.md b/vendor/github.com/hashicorp/yamux/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/yamux/README.md rename to vendor/github.com/hashicorp/yamux/README.md diff --git a/Godeps/_workspace/src/github.com/hashicorp/yamux/addr.go b/vendor/github.com/hashicorp/yamux/addr.go similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/yamux/addr.go rename to vendor/github.com/hashicorp/yamux/addr.go diff --git a/Godeps/_workspace/src/github.com/hashicorp/yamux/const.go b/vendor/github.com/hashicorp/yamux/const.go similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/yamux/const.go rename to vendor/github.com/hashicorp/yamux/const.go diff --git a/Godeps/_workspace/src/github.com/hashicorp/yamux/mux.go b/vendor/github.com/hashicorp/yamux/mux.go similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/yamux/mux.go rename to vendor/github.com/hashicorp/yamux/mux.go diff --git a/Godeps/_workspace/src/github.com/hashicorp/yamux/session.go b/vendor/github.com/hashicorp/yamux/session.go similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/yamux/session.go rename to vendor/github.com/hashicorp/yamux/session.go diff --git a/Godeps/_workspace/src/github.com/hashicorp/yamux/spec.md b/vendor/github.com/hashicorp/yamux/spec.md similarity index 98% rename from Godeps/_workspace/src/github.com/hashicorp/yamux/spec.md rename to vendor/github.com/hashicorp/yamux/spec.md index 419470b..b74dd64 100644 --- a/Godeps/_workspace/src/github.com/hashicorp/yamux/spec.md +++ b/vendor/github.com/hashicorp/yamux/spec.md @@ -96,7 +96,7 @@ Because we are relying on the reliable stream underneath, a connection can begin sending data once the SYN flag is sent. The corresponding ACK does not need to be received. This is particularly well suited for an RPC system where a client wants to open a stream and immediately -fire a request without wiating for the RTT of the ACK. +fire a request without waiting for the RTT of the ACK. This does introduce the possibility of a connection being rejected after data has been sent already. This is a slight semantic difference diff --git a/Godeps/_workspace/src/github.com/hashicorp/yamux/stream.go b/vendor/github.com/hashicorp/yamux/stream.go similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/yamux/stream.go rename to vendor/github.com/hashicorp/yamux/stream.go diff --git a/Godeps/_workspace/src/github.com/hashicorp/yamux/util.go b/vendor/github.com/hashicorp/yamux/util.go similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/yamux/util.go rename to vendor/github.com/hashicorp/yamux/util.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/go-fs/LICENSE b/vendor/github.com/mitchellh/go-fs/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/go-fs/LICENSE rename to vendor/github.com/mitchellh/go-fs/LICENSE diff --git a/Godeps/_workspace/src/github.com/mitchellh/go-fs/README.md b/vendor/github.com/mitchellh/go-fs/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/go-fs/README.md rename to vendor/github.com/mitchellh/go-fs/README.md diff --git a/Godeps/_workspace/src/github.com/mitchellh/go-fs/block_device.go b/vendor/github.com/mitchellh/go-fs/block_device.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/go-fs/block_device.go rename to vendor/github.com/mitchellh/go-fs/block_device.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/go-fs/directory.go b/vendor/github.com/mitchellh/go-fs/directory.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/go-fs/directory.go rename to vendor/github.com/mitchellh/go-fs/directory.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/go-fs/fat/boot_sector.go b/vendor/github.com/mitchellh/go-fs/fat/boot_sector.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/go-fs/fat/boot_sector.go rename to vendor/github.com/mitchellh/go-fs/fat/boot_sector.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/go-fs/fat/cluster_chain.go b/vendor/github.com/mitchellh/go-fs/fat/cluster_chain.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/go-fs/fat/cluster_chain.go rename to vendor/github.com/mitchellh/go-fs/fat/cluster_chain.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/go-fs/fat/directory.go b/vendor/github.com/mitchellh/go-fs/fat/directory.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/go-fs/fat/directory.go rename to vendor/github.com/mitchellh/go-fs/fat/directory.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/go-fs/fat/directory_cluster.go b/vendor/github.com/mitchellh/go-fs/fat/directory_cluster.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/go-fs/fat/directory_cluster.go rename to vendor/github.com/mitchellh/go-fs/fat/directory_cluster.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/go-fs/fat/fat.go b/vendor/github.com/mitchellh/go-fs/fat/fat.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/go-fs/fat/fat.go rename to vendor/github.com/mitchellh/go-fs/fat/fat.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/go-fs/fat/file.go b/vendor/github.com/mitchellh/go-fs/fat/file.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/go-fs/fat/file.go rename to vendor/github.com/mitchellh/go-fs/fat/file.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/go-fs/fat/filesystem.go b/vendor/github.com/mitchellh/go-fs/fat/filesystem.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/go-fs/fat/filesystem.go rename to vendor/github.com/mitchellh/go-fs/fat/filesystem.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/go-fs/fat/short_name.go b/vendor/github.com/mitchellh/go-fs/fat/short_name.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/go-fs/fat/short_name.go rename to vendor/github.com/mitchellh/go-fs/fat/short_name.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/go-fs/fat/super_floppy.go b/vendor/github.com/mitchellh/go-fs/fat/super_floppy.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/go-fs/fat/super_floppy.go rename to vendor/github.com/mitchellh/go-fs/fat/super_floppy.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/go-fs/fat/type.go b/vendor/github.com/mitchellh/go-fs/fat/type.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/go-fs/fat/type.go rename to vendor/github.com/mitchellh/go-fs/fat/type.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/go-fs/file.go b/vendor/github.com/mitchellh/go-fs/file.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/go-fs/file.go rename to vendor/github.com/mitchellh/go-fs/file.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/go-fs/file_disk.go b/vendor/github.com/mitchellh/go-fs/file_disk.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/go-fs/file_disk.go rename to vendor/github.com/mitchellh/go-fs/file_disk.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/go-fs/filesystem.go b/vendor/github.com/mitchellh/go-fs/filesystem.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/go-fs/filesystem.go rename to vendor/github.com/mitchellh/go-fs/filesystem.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/iochan/LICENSE.md b/vendor/github.com/mitchellh/iochan/LICENSE.md similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/iochan/LICENSE.md rename to vendor/github.com/mitchellh/iochan/LICENSE.md diff --git a/Godeps/_workspace/src/github.com/mitchellh/iochan/README.md b/vendor/github.com/mitchellh/iochan/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/iochan/README.md rename to vendor/github.com/mitchellh/iochan/README.md diff --git a/Godeps/_workspace/src/github.com/mitchellh/iochan/iochan.go b/vendor/github.com/mitchellh/iochan/iochan.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/iochan/iochan.go rename to vendor/github.com/mitchellh/iochan/iochan.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/.travis.yml b/vendor/github.com/mitchellh/mapstructure/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/mapstructure/.travis.yml rename to vendor/github.com/mitchellh/mapstructure/.travis.yml diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/LICENSE b/vendor/github.com/mitchellh/mapstructure/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/mapstructure/LICENSE rename to vendor/github.com/mitchellh/mapstructure/LICENSE diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/README.md b/vendor/github.com/mitchellh/mapstructure/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/mapstructure/README.md rename to vendor/github.com/mitchellh/mapstructure/README.md diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/decode_hooks.go b/vendor/github.com/mitchellh/mapstructure/decode_hooks.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/mapstructure/decode_hooks.go rename to vendor/github.com/mitchellh/mapstructure/decode_hooks.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/error.go b/vendor/github.com/mitchellh/mapstructure/error.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/mapstructure/error.go rename to vendor/github.com/mitchellh/mapstructure/error.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure.go b/vendor/github.com/mitchellh/mapstructure/mapstructure.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure.go rename to vendor/github.com/mitchellh/mapstructure/mapstructure.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/multistep/LICENSE.md b/vendor/github.com/mitchellh/multistep/LICENSE.md similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/multistep/LICENSE.md rename to vendor/github.com/mitchellh/multistep/LICENSE.md diff --git a/Godeps/_workspace/src/github.com/mitchellh/multistep/README.md b/vendor/github.com/mitchellh/multistep/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/multistep/README.md rename to vendor/github.com/mitchellh/multistep/README.md diff --git a/Godeps/_workspace/src/github.com/mitchellh/multistep/basic_runner.go b/vendor/github.com/mitchellh/multistep/basic_runner.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/multistep/basic_runner.go rename to vendor/github.com/mitchellh/multistep/basic_runner.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/multistep/debug_runner.go b/vendor/github.com/mitchellh/multistep/debug_runner.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/multistep/debug_runner.go rename to vendor/github.com/mitchellh/multistep/debug_runner.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/multistep/multistep.go b/vendor/github.com/mitchellh/multistep/multistep.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/multistep/multistep.go rename to vendor/github.com/mitchellh/multistep/multistep.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/multistep/statebag.go b/vendor/github.com/mitchellh/multistep/statebag.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/multistep/statebag.go rename to vendor/github.com/mitchellh/multistep/statebag.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/LICENSE b/vendor/github.com/mitchellh/packer/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/LICENSE rename to vendor/github.com/mitchellh/packer/LICENSE diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/common/config.go b/vendor/github.com/mitchellh/packer/common/config.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/common/config.go rename to vendor/github.com/mitchellh/packer/common/config.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/common/download.go b/vendor/github.com/mitchellh/packer/common/download.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/common/download.go rename to vendor/github.com/mitchellh/packer/common/download.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/common/http_config.go b/vendor/github.com/mitchellh/packer/common/http_config.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/common/http_config.go rename to vendor/github.com/mitchellh/packer/common/http_config.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/common/iso_config.go b/vendor/github.com/mitchellh/packer/common/iso_config.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/common/iso_config.go rename to vendor/github.com/mitchellh/packer/common/iso_config.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/common/multistep_debug.go b/vendor/github.com/mitchellh/packer/common/multistep_debug.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/common/multistep_debug.go rename to vendor/github.com/mitchellh/packer/common/multistep_debug.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/common/packer_config.go b/vendor/github.com/mitchellh/packer/common/packer_config.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/common/packer_config.go rename to vendor/github.com/mitchellh/packer/common/packer_config.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/common/step_create_floppy.go b/vendor/github.com/mitchellh/packer/common/step_create_floppy.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/common/step_create_floppy.go rename to vendor/github.com/mitchellh/packer/common/step_create_floppy.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/common/step_download.go b/vendor/github.com/mitchellh/packer/common/step_download.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/common/step_download.go rename to vendor/github.com/mitchellh/packer/common/step_download.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/common/step_http_server.go b/vendor/github.com/mitchellh/packer/common/step_http_server.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/common/step_http_server.go rename to vendor/github.com/mitchellh/packer/common/step_http_server.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/common/step_provision.go b/vendor/github.com/mitchellh/packer/common/step_provision.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/common/step_provision.go rename to vendor/github.com/mitchellh/packer/common/step_provision.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/common/uuid/uuid.go b/vendor/github.com/mitchellh/packer/common/uuid/uuid.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/common/uuid/uuid.go rename to vendor/github.com/mitchellh/packer/common/uuid/uuid.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/helper/config/decode.go b/vendor/github.com/mitchellh/packer/helper/config/decode.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/helper/config/decode.go rename to vendor/github.com/mitchellh/packer/helper/config/decode.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/artifact.go b/vendor/github.com/mitchellh/packer/packer/artifact.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/artifact.go rename to vendor/github.com/mitchellh/packer/packer/artifact.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/artifact_mock.go b/vendor/github.com/mitchellh/packer/packer/artifact_mock.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/artifact_mock.go rename to vendor/github.com/mitchellh/packer/packer/artifact_mock.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/build.go b/vendor/github.com/mitchellh/packer/packer/build.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/build.go rename to vendor/github.com/mitchellh/packer/packer/build.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/builder.go b/vendor/github.com/mitchellh/packer/packer/builder.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/builder.go rename to vendor/github.com/mitchellh/packer/packer/builder.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/builder_mock.go b/vendor/github.com/mitchellh/packer/packer/builder_mock.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/builder_mock.go rename to vendor/github.com/mitchellh/packer/packer/builder_mock.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/cache.go b/vendor/github.com/mitchellh/packer/packer/cache.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/cache.go rename to vendor/github.com/mitchellh/packer/packer/cache.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/communicator.go b/vendor/github.com/mitchellh/packer/packer/communicator.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/communicator.go rename to vendor/github.com/mitchellh/packer/packer/communicator.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/communicator_mock.go b/vendor/github.com/mitchellh/packer/packer/communicator_mock.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/communicator_mock.go rename to vendor/github.com/mitchellh/packer/packer/communicator_mock.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/config_file.go b/vendor/github.com/mitchellh/packer/packer/config_file.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/config_file.go rename to vendor/github.com/mitchellh/packer/packer/config_file.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/config_file_unix.go b/vendor/github.com/mitchellh/packer/packer/config_file_unix.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/config_file_unix.go rename to vendor/github.com/mitchellh/packer/packer/config_file_unix.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/config_file_windows.go b/vendor/github.com/mitchellh/packer/packer/config_file_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/config_file_windows.go rename to vendor/github.com/mitchellh/packer/packer/config_file_windows.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/core.go b/vendor/github.com/mitchellh/packer/packer/core.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/core.go rename to vendor/github.com/mitchellh/packer/packer/core.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/hook.go b/vendor/github.com/mitchellh/packer/packer/hook.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/hook.go rename to vendor/github.com/mitchellh/packer/packer/hook.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/hook_mock.go b/vendor/github.com/mitchellh/packer/packer/hook_mock.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/hook_mock.go rename to vendor/github.com/mitchellh/packer/packer/hook_mock.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/multi_error.go b/vendor/github.com/mitchellh/packer/packer/multi_error.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/multi_error.go rename to vendor/github.com/mitchellh/packer/packer/multi_error.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/plugin/builder.go b/vendor/github.com/mitchellh/packer/packer/plugin/builder.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/plugin/builder.go rename to vendor/github.com/mitchellh/packer/packer/plugin/builder.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/plugin/client.go b/vendor/github.com/mitchellh/packer/packer/plugin/client.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/plugin/client.go rename to vendor/github.com/mitchellh/packer/packer/plugin/client.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/plugin/hook.go b/vendor/github.com/mitchellh/packer/packer/plugin/hook.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/plugin/hook.go rename to vendor/github.com/mitchellh/packer/packer/plugin/hook.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/plugin/post_processor.go b/vendor/github.com/mitchellh/packer/packer/plugin/post_processor.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/plugin/post_processor.go rename to vendor/github.com/mitchellh/packer/packer/plugin/post_processor.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/plugin/provisioner.go b/vendor/github.com/mitchellh/packer/packer/plugin/provisioner.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/plugin/provisioner.go rename to vendor/github.com/mitchellh/packer/packer/plugin/provisioner.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/plugin/server.go b/vendor/github.com/mitchellh/packer/packer/plugin/server.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/plugin/server.go rename to vendor/github.com/mitchellh/packer/packer/plugin/server.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/post_processor.go b/vendor/github.com/mitchellh/packer/packer/post_processor.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/post_processor.go rename to vendor/github.com/mitchellh/packer/packer/post_processor.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/post_processor_mock.go b/vendor/github.com/mitchellh/packer/packer/post_processor_mock.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/post_processor_mock.go rename to vendor/github.com/mitchellh/packer/packer/post_processor_mock.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/provisioner.go b/vendor/github.com/mitchellh/packer/packer/provisioner.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/provisioner.go rename to vendor/github.com/mitchellh/packer/packer/provisioner.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/provisioner_mock.go b/vendor/github.com/mitchellh/packer/packer/provisioner_mock.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/provisioner_mock.go rename to vendor/github.com/mitchellh/packer/packer/provisioner_mock.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/artifact.go b/vendor/github.com/mitchellh/packer/packer/rpc/artifact.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/artifact.go rename to vendor/github.com/mitchellh/packer/packer/rpc/artifact.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/build.go b/vendor/github.com/mitchellh/packer/packer/rpc/build.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/build.go rename to vendor/github.com/mitchellh/packer/packer/rpc/build.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/builder.go b/vendor/github.com/mitchellh/packer/packer/rpc/builder.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/builder.go rename to vendor/github.com/mitchellh/packer/packer/rpc/builder.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/cache.go b/vendor/github.com/mitchellh/packer/packer/rpc/cache.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/cache.go rename to vendor/github.com/mitchellh/packer/packer/rpc/cache.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/client.go b/vendor/github.com/mitchellh/packer/packer/rpc/client.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/client.go rename to vendor/github.com/mitchellh/packer/packer/rpc/client.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/communicator.go b/vendor/github.com/mitchellh/packer/packer/rpc/communicator.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/communicator.go rename to vendor/github.com/mitchellh/packer/packer/rpc/communicator.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/dial.go b/vendor/github.com/mitchellh/packer/packer/rpc/dial.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/dial.go rename to vendor/github.com/mitchellh/packer/packer/rpc/dial.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/error.go b/vendor/github.com/mitchellh/packer/packer/rpc/error.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/error.go rename to vendor/github.com/mitchellh/packer/packer/rpc/error.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/hook.go b/vendor/github.com/mitchellh/packer/packer/rpc/hook.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/hook.go rename to vendor/github.com/mitchellh/packer/packer/rpc/hook.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/init.go b/vendor/github.com/mitchellh/packer/packer/rpc/init.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/init.go rename to vendor/github.com/mitchellh/packer/packer/rpc/init.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/mux_broker.go b/vendor/github.com/mitchellh/packer/packer/rpc/mux_broker.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/mux_broker.go rename to vendor/github.com/mitchellh/packer/packer/rpc/mux_broker.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/post_processor.go b/vendor/github.com/mitchellh/packer/packer/rpc/post_processor.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/post_processor.go rename to vendor/github.com/mitchellh/packer/packer/rpc/post_processor.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/provisioner.go b/vendor/github.com/mitchellh/packer/packer/rpc/provisioner.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/provisioner.go rename to vendor/github.com/mitchellh/packer/packer/rpc/provisioner.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/server.go b/vendor/github.com/mitchellh/packer/packer/rpc/server.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/server.go rename to vendor/github.com/mitchellh/packer/packer/rpc/server.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/ui.go b/vendor/github.com/mitchellh/packer/packer/rpc/ui.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/rpc/ui.go rename to vendor/github.com/mitchellh/packer/packer/rpc/ui.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/testing.go b/vendor/github.com/mitchellh/packer/packer/testing.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/testing.go rename to vendor/github.com/mitchellh/packer/packer/testing.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/packer/ui.go b/vendor/github.com/mitchellh/packer/packer/ui.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/packer/ui.go rename to vendor/github.com/mitchellh/packer/packer/ui.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/template/interpolate/funcs.go b/vendor/github.com/mitchellh/packer/template/interpolate/funcs.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/template/interpolate/funcs.go rename to vendor/github.com/mitchellh/packer/template/interpolate/funcs.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/template/interpolate/i.go b/vendor/github.com/mitchellh/packer/template/interpolate/i.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/template/interpolate/i.go rename to vendor/github.com/mitchellh/packer/template/interpolate/i.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/template/interpolate/parse.go b/vendor/github.com/mitchellh/packer/template/interpolate/parse.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/template/interpolate/parse.go rename to vendor/github.com/mitchellh/packer/template/interpolate/parse.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/template/interpolate/render.go b/vendor/github.com/mitchellh/packer/template/interpolate/render.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/template/interpolate/render.go rename to vendor/github.com/mitchellh/packer/template/interpolate/render.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/template/parse.go b/vendor/github.com/mitchellh/packer/template/parse.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/template/parse.go rename to vendor/github.com/mitchellh/packer/template/parse.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/packer/template/template.go b/vendor/github.com/mitchellh/packer/template/template.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/packer/template/template.go rename to vendor/github.com/mitchellh/packer/template/template.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/reflectwalk/LICENSE b/vendor/github.com/mitchellh/reflectwalk/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/reflectwalk/LICENSE rename to vendor/github.com/mitchellh/reflectwalk/LICENSE diff --git a/Godeps/_workspace/src/github.com/mitchellh/reflectwalk/README.md b/vendor/github.com/mitchellh/reflectwalk/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/reflectwalk/README.md rename to vendor/github.com/mitchellh/reflectwalk/README.md diff --git a/Godeps/_workspace/src/github.com/mitchellh/reflectwalk/location.go b/vendor/github.com/mitchellh/reflectwalk/location.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/reflectwalk/location.go rename to vendor/github.com/mitchellh/reflectwalk/location.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/reflectwalk/location_string.go b/vendor/github.com/mitchellh/reflectwalk/location_string.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/reflectwalk/location_string.go rename to vendor/github.com/mitchellh/reflectwalk/location_string.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/reflectwalk/reflectwalk.go b/vendor/github.com/mitchellh/reflectwalk/reflectwalk.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/reflectwalk/reflectwalk.go rename to vendor/github.com/mitchellh/reflectwalk/reflectwalk.go diff --git a/Godeps/_workspace/src/github.com/ugorji/go/LICENSE b/vendor/github.com/ugorji/go/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/LICENSE rename to vendor/github.com/ugorji/go/LICENSE diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/0doc.go b/vendor/github.com/ugorji/go/codec/0doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/0doc.go rename to vendor/github.com/ugorji/go/codec/0doc.go diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/README.md b/vendor/github.com/ugorji/go/codec/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/README.md rename to vendor/github.com/ugorji/go/codec/README.md diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/binc.go b/vendor/github.com/ugorji/go/codec/binc.go similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/binc.go rename to vendor/github.com/ugorji/go/codec/binc.go diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/cbor.go b/vendor/github.com/ugorji/go/codec/cbor.go similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/cbor.go rename to vendor/github.com/ugorji/go/codec/cbor.go diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/decode.go b/vendor/github.com/ugorji/go/codec/decode.go similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/decode.go rename to vendor/github.com/ugorji/go/codec/decode.go diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/encode.go b/vendor/github.com/ugorji/go/codec/encode.go similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/encode.go rename to vendor/github.com/ugorji/go/codec/encode.go diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/fast-path.generated.go b/vendor/github.com/ugorji/go/codec/fast-path.generated.go similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/fast-path.generated.go rename to vendor/github.com/ugorji/go/codec/fast-path.generated.go diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/fast-path.go.tmpl b/vendor/github.com/ugorji/go/codec/fast-path.go.tmpl similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/fast-path.go.tmpl rename to vendor/github.com/ugorji/go/codec/fast-path.go.tmpl diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/fast-path.not.go b/vendor/github.com/ugorji/go/codec/fast-path.not.go similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/fast-path.not.go rename to vendor/github.com/ugorji/go/codec/fast-path.not.go diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/gen-dec-array.go.tmpl b/vendor/github.com/ugorji/go/codec/gen-dec-array.go.tmpl similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/gen-dec-array.go.tmpl rename to vendor/github.com/ugorji/go/codec/gen-dec-array.go.tmpl diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/gen-dec-map.go.tmpl b/vendor/github.com/ugorji/go/codec/gen-dec-map.go.tmpl similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/gen-dec-map.go.tmpl rename to vendor/github.com/ugorji/go/codec/gen-dec-map.go.tmpl diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/gen-helper.generated.go b/vendor/github.com/ugorji/go/codec/gen-helper.generated.go similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/gen-helper.generated.go rename to vendor/github.com/ugorji/go/codec/gen-helper.generated.go diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/gen-helper.go.tmpl b/vendor/github.com/ugorji/go/codec/gen-helper.go.tmpl similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/gen-helper.go.tmpl rename to vendor/github.com/ugorji/go/codec/gen-helper.go.tmpl diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/gen.generated.go b/vendor/github.com/ugorji/go/codec/gen.generated.go similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/gen.generated.go rename to vendor/github.com/ugorji/go/codec/gen.generated.go diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/gen.go b/vendor/github.com/ugorji/go/codec/gen.go similarity index 99% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/gen.go rename to vendor/github.com/ugorji/go/codec/gen.go index 8544f04..ac8cc6d 100644 --- a/Godeps/_workspace/src/github.com/ugorji/go/codec/gen.go +++ b/vendor/github.com/ugorji/go/codec/gen.go @@ -12,7 +12,6 @@ import ( "io" "io/ioutil" "math/rand" - "os" "reflect" "regexp" "sort" @@ -126,6 +125,7 @@ var ( genExpectArrayOrMapErr = errors.New("unexpected type. Expecting array/map/slice") genBase64enc = base64.NewEncoding("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789__") genQNameRegex = regexp.MustCompile(`[A-Za-z_.]+`) + genCheckVendor bool ) // genRunner holds some state used during a Gen run. @@ -1626,8 +1626,6 @@ func (x *genV) MethodNamePfx(prefix string, prim bool) string { } -var genCheckVendor = os.Getenv("GO15VENDOREXPERIMENT") == "1" - // genImportPath returns import path of a non-predeclared named typed, or an empty string otherwise. // // This handles the misbehaviour that occurs when 1.5-style vendoring is enabled, @@ -1678,7 +1676,7 @@ func genNonPtr(t reflect.Type) reflect.Type { func genTitleCaseName(s string) string { switch s { - case "interface{}": + case "interface{}", "interface {}": return "Intf" default: return strings.ToUpper(s[0:1]) + s[1:] @@ -1781,7 +1779,7 @@ func (x genInternal) FastpathLen() (l int) { func genInternalZeroValue(s string) string { switch s { - case "interface{}": + case "interface{}", "interface {}": return "nil" case "bool": return "false" diff --git a/vendor/github.com/ugorji/go/codec/gen_15.go b/vendor/github.com/ugorji/go/codec/gen_15.go new file mode 100644 index 0000000..ab76c31 --- /dev/null +++ b/vendor/github.com/ugorji/go/codec/gen_15.go @@ -0,0 +1,12 @@ +// Copyright (c) 2012-2015 Ugorji Nwoke. All rights reserved. +// Use of this source code is governed by a MIT license found in the LICENSE file. + +// +build go1.5,!go1.6 + +package codec + +import "os" + +func init() { + genCheckVendor = os.Getenv("GO15VENDOREXPERIMENT") == "1" +} diff --git a/vendor/github.com/ugorji/go/codec/gen_16.go b/vendor/github.com/ugorji/go/codec/gen_16.go new file mode 100644 index 0000000..87c04e2 --- /dev/null +++ b/vendor/github.com/ugorji/go/codec/gen_16.go @@ -0,0 +1,12 @@ +// Copyright (c) 2012-2015 Ugorji Nwoke. All rights reserved. +// Use of this source code is governed by a MIT license found in the LICENSE file. + +// +build go1.6 + +package codec + +import "os" + +func init() { + genCheckVendor = os.Getenv("GO15VENDOREXPERIMENT") != "0" +} diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/helper.go b/vendor/github.com/ugorji/go/codec/helper.go similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/helper.go rename to vendor/github.com/ugorji/go/codec/helper.go diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/helper_internal.go b/vendor/github.com/ugorji/go/codec/helper_internal.go similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/helper_internal.go rename to vendor/github.com/ugorji/go/codec/helper_internal.go diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/helper_not_unsafe.go b/vendor/github.com/ugorji/go/codec/helper_not_unsafe.go similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/helper_not_unsafe.go rename to vendor/github.com/ugorji/go/codec/helper_not_unsafe.go diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/helper_unsafe.go b/vendor/github.com/ugorji/go/codec/helper_unsafe.go similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/helper_unsafe.go rename to vendor/github.com/ugorji/go/codec/helper_unsafe.go diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/json.go b/vendor/github.com/ugorji/go/codec/json.go similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/json.go rename to vendor/github.com/ugorji/go/codec/json.go diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/msgpack.go b/vendor/github.com/ugorji/go/codec/msgpack.go similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/msgpack.go rename to vendor/github.com/ugorji/go/codec/msgpack.go diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/noop.go b/vendor/github.com/ugorji/go/codec/noop.go similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/noop.go rename to vendor/github.com/ugorji/go/codec/noop.go diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/prebuild.go b/vendor/github.com/ugorji/go/codec/prebuild.go similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/prebuild.go rename to vendor/github.com/ugorji/go/codec/prebuild.go diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/prebuild.sh b/vendor/github.com/ugorji/go/codec/prebuild.sh similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/prebuild.sh rename to vendor/github.com/ugorji/go/codec/prebuild.sh diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/rpc.go b/vendor/github.com/ugorji/go/codec/rpc.go similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/rpc.go rename to vendor/github.com/ugorji/go/codec/rpc.go diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/simple.go b/vendor/github.com/ugorji/go/codec/simple.go similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/simple.go rename to vendor/github.com/ugorji/go/codec/simple.go diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/test-cbor-goldens.json b/vendor/github.com/ugorji/go/codec/test-cbor-goldens.json similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/test-cbor-goldens.json rename to vendor/github.com/ugorji/go/codec/test-cbor-goldens.json diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/test.py b/vendor/github.com/ugorji/go/codec/test.py similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/test.py rename to vendor/github.com/ugorji/go/codec/test.py diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/tests.sh b/vendor/github.com/ugorji/go/codec/tests.sh similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/tests.sh rename to vendor/github.com/ugorji/go/codec/tests.sh diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/time.go b/vendor/github.com/ugorji/go/codec/time.go similarity index 100% rename from Godeps/_workspace/src/github.com/ugorji/go/codec/time.go rename to vendor/github.com/ugorji/go/codec/time.go diff --git a/Godeps/_workspace/src/golang.org/x/crypto/LICENSE b/vendor/golang.org/x/crypto/LICENSE similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/LICENSE rename to vendor/golang.org/x/crypto/LICENSE diff --git a/Godeps/_workspace/src/golang.org/x/crypto/PATENTS b/vendor/golang.org/x/crypto/PATENTS similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/PATENTS rename to vendor/golang.org/x/crypto/PATENTS diff --git a/Godeps/_workspace/src/golang.org/x/crypto/curve25519/const_amd64.s b/vendor/golang.org/x/crypto/curve25519/const_amd64.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/curve25519/const_amd64.s rename to vendor/golang.org/x/crypto/curve25519/const_amd64.s diff --git a/Godeps/_workspace/src/golang.org/x/crypto/curve25519/cswap_amd64.s b/vendor/golang.org/x/crypto/curve25519/cswap_amd64.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/curve25519/cswap_amd64.s rename to vendor/golang.org/x/crypto/curve25519/cswap_amd64.s diff --git a/Godeps/_workspace/src/golang.org/x/crypto/curve25519/curve25519.go b/vendor/golang.org/x/crypto/curve25519/curve25519.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/curve25519/curve25519.go rename to vendor/golang.org/x/crypto/curve25519/curve25519.go diff --git a/Godeps/_workspace/src/golang.org/x/crypto/curve25519/doc.go b/vendor/golang.org/x/crypto/curve25519/doc.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/curve25519/doc.go rename to vendor/golang.org/x/crypto/curve25519/doc.go diff --git a/Godeps/_workspace/src/golang.org/x/crypto/curve25519/freeze_amd64.s b/vendor/golang.org/x/crypto/curve25519/freeze_amd64.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/curve25519/freeze_amd64.s rename to vendor/golang.org/x/crypto/curve25519/freeze_amd64.s diff --git a/Godeps/_workspace/src/golang.org/x/crypto/curve25519/ladderstep_amd64.s b/vendor/golang.org/x/crypto/curve25519/ladderstep_amd64.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/curve25519/ladderstep_amd64.s rename to vendor/golang.org/x/crypto/curve25519/ladderstep_amd64.s diff --git a/Godeps/_workspace/src/golang.org/x/crypto/curve25519/mont25519_amd64.go b/vendor/golang.org/x/crypto/curve25519/mont25519_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/curve25519/mont25519_amd64.go rename to vendor/golang.org/x/crypto/curve25519/mont25519_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/crypto/curve25519/mul_amd64.s b/vendor/golang.org/x/crypto/curve25519/mul_amd64.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/curve25519/mul_amd64.s rename to vendor/golang.org/x/crypto/curve25519/mul_amd64.s diff --git a/Godeps/_workspace/src/golang.org/x/crypto/curve25519/square_amd64.s b/vendor/golang.org/x/crypto/curve25519/square_amd64.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/curve25519/square_amd64.s rename to vendor/golang.org/x/crypto/curve25519/square_amd64.s diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/buffer.go b/vendor/golang.org/x/crypto/ssh/buffer.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/buffer.go rename to vendor/golang.org/x/crypto/ssh/buffer.go diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/certs.go b/vendor/golang.org/x/crypto/ssh/certs.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/certs.go rename to vendor/golang.org/x/crypto/ssh/certs.go diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/channel.go b/vendor/golang.org/x/crypto/ssh/channel.go similarity index 99% rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/channel.go rename to vendor/golang.org/x/crypto/ssh/channel.go index 5403c7e..6671c98 100644 --- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/channel.go +++ b/vendor/golang.org/x/crypto/ssh/channel.go @@ -217,7 +217,7 @@ func (c *channel) writePacket(packet []byte) error { func (c *channel) sendMessage(msg interface{}) error { if debugMux { - log.Printf("send %d: %#v", c.mux.chanList.offset, msg) + log.Printf("send(%d): %#v", c.mux.chanList.offset, msg) } p := Marshal(msg) @@ -371,7 +371,7 @@ func (c *channel) close() { close(c.msg) close(c.incomingRequests) c.writeMu.Lock() - // This is not necesary for a normal channel teardown, but if + // This is not necessary for a normal channel teardown, but if // there was another error, it is. c.sentClose = true c.writeMu.Unlock() diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/cipher.go b/vendor/golang.org/x/crypto/ssh/cipher.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/cipher.go rename to vendor/golang.org/x/crypto/ssh/cipher.go diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/client.go b/vendor/golang.org/x/crypto/ssh/client.go similarity index 95% rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/client.go rename to vendor/golang.org/x/crypto/ssh/client.go index 0b9fbe5..e0f1a4d 100644 --- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/client.go +++ b/vendor/golang.org/x/crypto/ssh/client.go @@ -9,6 +9,7 @@ import ( "fmt" "net" "sync" + "time" ) // Client implements a traditional SSH client that supports shells, @@ -96,7 +97,7 @@ func (c *connection) clientHandshake(dialAddress string, config *ClientConfig) e c.transport = newClientTransport( newTransport(c.sshConn.conn, config.Rand, true /* is client */), c.clientVersion, c.serverVersion, config, dialAddress, c.sshConn.RemoteAddr()) - if err := c.transport.requestKeyChange(); err != nil { + if err := c.transport.requestInitialKeyChange(); err != nil { return err } @@ -169,7 +170,7 @@ func (c *Client) handleChannelOpens(in <-chan NewChannel) { // to incoming channels and requests, use net.Dial with NewClientConn // instead. func Dial(network, addr string, config *ClientConfig) (*Client, error) { - conn, err := net.Dial(network, addr) + conn, err := net.DialTimeout(network, addr, config.Timeout) if err != nil { return nil, err } @@ -210,4 +211,9 @@ type ClientConfig struct { // string returned from PublicKey.Type method may be used, or // any of the CertAlgoXxxx and KeyAlgoXxxx constants. HostKeyAlgorithms []string + + // Timeout is the maximum amount of time for the TCP connection to establish. + // + // A Timeout of zero means no timeout. + Timeout time.Duration } diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/client_auth.go b/vendor/golang.org/x/crypto/ssh/client_auth.go similarity index 99% rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/client_auth.go rename to vendor/golang.org/x/crypto/ssh/client_auth.go index e15be3e..6956ce4 100644 --- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/client_auth.go +++ b/vendor/golang.org/x/crypto/ssh/client_auth.go @@ -321,8 +321,6 @@ func handleAuthResponse(c packetConn) (bool, []string, error) { return false, msg.Methods, nil case msgUserAuthSuccess: return true, nil, nil - case msgDisconnect: - return false, nil, io.EOF default: return false, nil, unexpectedMessageError(msgUserAuthSuccess, packet[0]) } diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/common.go b/vendor/golang.org/x/crypto/ssh/common.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/common.go rename to vendor/golang.org/x/crypto/ssh/common.go diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/connection.go b/vendor/golang.org/x/crypto/ssh/connection.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/connection.go rename to vendor/golang.org/x/crypto/ssh/connection.go diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/doc.go b/vendor/golang.org/x/crypto/ssh/doc.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/doc.go rename to vendor/golang.org/x/crypto/ssh/doc.go diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/handshake.go b/vendor/golang.org/x/crypto/ssh/handshake.go similarity index 87% rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/handshake.go rename to vendor/golang.org/x/crypto/ssh/handshake.go index 1c54f75..8854274 100644 --- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/handshake.go +++ b/vendor/golang.org/x/crypto/ssh/handshake.go @@ -29,25 +29,6 @@ type keyingTransport interface { // direction will be effected if a msgNewKeys message is sent // or received. prepareKeyChange(*algorithms, *kexResult) error - - // getSessionID returns the session ID. prepareKeyChange must - // have been called once. - getSessionID() []byte -} - -// rekeyingTransport is the interface of handshakeTransport that we -// (internally) expose to ClientConn and ServerConn. -type rekeyingTransport interface { - packetConn - - // requestKeyChange asks the remote side to change keys. All - // writes are blocked until the key change succeeds, which is - // signaled by reading a msgNewKeys. - requestKeyChange() error - - // getSessionID returns the session ID. This is only valid - // after the first key change has completed. - getSessionID() []byte } // handshakeTransport implements rekeying on top of a keyingTransport @@ -86,6 +67,9 @@ type handshakeTransport struct { sentInitMsg *kexInitMsg writtenSinceKex uint64 writeError error + + // The session ID or nil if first kex did not complete yet. + sessionID []byte } func newHandshakeTransport(conn keyingTransport, config *Config, clientVersion, serverVersion []byte) *handshakeTransport { @@ -122,7 +106,7 @@ func newServerTransport(conn keyingTransport, clientVersion, serverVersion []byt } func (t *handshakeTransport) getSessionID() []byte { - return t.conn.getSessionID() + return t.sessionID } func (t *handshakeTransport) id() string { @@ -183,9 +167,9 @@ func (t *handshakeTransport) readOnePacket() ([]byte, error) { if p[0] != msgKexInit { return p, nil } - err = t.enterKeyExchange(p) t.mu.Lock() + err = t.enterKeyExchangeLocked(p) if err != nil { // drop connection t.conn.Close() @@ -211,25 +195,39 @@ func (t *handshakeTransport) readOnePacket() ([]byte, error) { return []byte{msgNewKeys}, nil } +// keyChangeCategory describes whether a key exchange is the first on a +// connection, or a subsequent one. +type keyChangeCategory bool + +const ( + firstKeyExchange keyChangeCategory = true + subsequentKeyExchange keyChangeCategory = false +) + // sendKexInit sends a key change message, and returns the message // that was sent. After initiating the key change, all writes will be // blocked until the change is done, and a failed key change will // close the underlying transport. This function is safe for // concurrent use by multiple goroutines. -func (t *handshakeTransport) sendKexInit() (*kexInitMsg, []byte, error) { +func (t *handshakeTransport) sendKexInit(isFirst keyChangeCategory) (*kexInitMsg, []byte, error) { t.mu.Lock() defer t.mu.Unlock() - return t.sendKexInitLocked() + return t.sendKexInitLocked(isFirst) +} + +func (t *handshakeTransport) requestInitialKeyChange() error { + _, _, err := t.sendKexInit(firstKeyExchange) + return err } func (t *handshakeTransport) requestKeyChange() error { - _, _, err := t.sendKexInit() + _, _, err := t.sendKexInit(subsequentKeyExchange) return err } // sendKexInitLocked sends a key change message. t.mu must be locked // while this happens. -func (t *handshakeTransport) sendKexInitLocked() (*kexInitMsg, []byte, error) { +func (t *handshakeTransport) sendKexInitLocked(isFirst keyChangeCategory) (*kexInitMsg, []byte, error) { // kexInits may be sent either in response to the other side, // or because our side wants to initiate a key change, so we // may have already sent a kexInit. In that case, don't send a @@ -237,6 +235,14 @@ func (t *handshakeTransport) sendKexInitLocked() (*kexInitMsg, []byte, error) { if t.sentInitMsg != nil { return t.sentInitMsg, t.sentInitPacket, nil } + + // If this is the initial key change, but we already have a sessionID, + // then do nothing because the key exchange has already completed + // asynchronously. + if isFirst && t.sessionID != nil { + return nil, nil, nil + } + msg := &kexInitMsg{ KexAlgos: t.config.KeyExchanges, CiphersClientServer: t.config.Ciphers, @@ -276,7 +282,7 @@ func (t *handshakeTransport) writePacket(p []byte) error { defer t.mu.Unlock() if t.writtenSinceKex > t.config.RekeyThreshold { - t.sendKexInitLocked() + t.sendKexInitLocked(subsequentKeyExchange) } for t.sentInitMsg != nil && t.writeError == nil { t.cond.Wait() @@ -300,12 +306,12 @@ func (t *handshakeTransport) Close() error { return t.conn.Close() } -// enterKeyExchange runs the key exchange. -func (t *handshakeTransport) enterKeyExchange(otherInitPacket []byte) error { +// enterKeyExchange runs the key exchange. t.mu must be held while running this. +func (t *handshakeTransport) enterKeyExchangeLocked(otherInitPacket []byte) error { if debugHandshake { log.Printf("%s entered key exchange", t.id()) } - myInit, myInitPacket, err := t.sendKexInit() + myInit, myInitPacket, err := t.sendKexInitLocked(subsequentKeyExchange) if err != nil { return err } @@ -362,6 +368,11 @@ func (t *handshakeTransport) enterKeyExchange(otherInitPacket []byte) error { return err } + if t.sessionID == nil { + t.sessionID = result.H + } + result.SessionID = t.sessionID + t.conn.prepareKeyChange(algs, result) if err = t.conn.writePacket([]byte{msgNewKeys}); err != nil { return err @@ -371,6 +382,7 @@ func (t *handshakeTransport) enterKeyExchange(otherInitPacket []byte) error { } else if packet[0] != msgNewKeys { return unexpectedMessageError(msgNewKeys, packet[0]) } + return nil } diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/kex.go b/vendor/golang.org/x/crypto/ssh/kex.go similarity index 99% rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/kex.go rename to vendor/golang.org/x/crypto/ssh/kex.go index 3ec603c..9285ee3 100644 --- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/kex.go +++ b/vendor/golang.org/x/crypto/ssh/kex.go @@ -46,7 +46,7 @@ type kexResult struct { Hash crypto.Hash // The session ID, which is the first H computed. This is used - // to signal data inside transport. + // to derive key material inside the transport. SessionID []byte } diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/keys.go b/vendor/golang.org/x/crypto/ssh/keys.go similarity index 98% rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/keys.go rename to vendor/golang.org/x/crypto/ssh/keys.go index cfc970b..25be3c5 100644 --- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/keys.go +++ b/vendor/golang.org/x/crypto/ssh/keys.go @@ -319,6 +319,8 @@ func parseRSA(in []byte) (out PublicKey, rest []byte, err error) { func (r *rsaPublicKey) Marshal() []byte { e := new(big.Int).SetInt64(int64(r.E)) + // RSA publickey struct layout should match the struct used by + // parseRSACert in the x/crypto/ssh/agent package. wirekey := struct { Name string E *big.Int @@ -369,6 +371,8 @@ func parseDSA(in []byte) (out PublicKey, rest []byte, err error) { } func (k *dsaPublicKey) Marshal() []byte { + // DSA publickey struct layout should match the struct used by + // parseDSACert in the x/crypto/ssh/agent package. w := struct { Name string P, Q, G, Y *big.Int @@ -507,6 +511,8 @@ func parseECDSA(in []byte) (out PublicKey, rest []byte, err error) { func (key *ecdsaPublicKey) Marshal() []byte { // See RFC 5656, section 3.1. keyBytes := elliptic.Marshal(key.Curve, key.X, key.Y) + // ECDSA publickey struct layout should match the struct used by + // parseECDSACert in the x/crypto/ssh/agent package. w := struct { Name string ID string diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/mac.go b/vendor/golang.org/x/crypto/ssh/mac.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/mac.go rename to vendor/golang.org/x/crypto/ssh/mac.go diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/messages.go b/vendor/golang.org/x/crypto/ssh/messages.go similarity index 90% rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/messages.go rename to vendor/golang.org/x/crypto/ssh/messages.go index eaf6106..e6ecd3a 100644 --- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/messages.go +++ b/vendor/golang.org/x/crypto/ssh/messages.go @@ -13,6 +13,7 @@ import ( "math/big" "reflect" "strconv" + "strings" ) // These are SSH message type numbers. They are scattered around several @@ -47,7 +48,7 @@ type disconnectMsg struct { } func (d *disconnectMsg) Error() string { - return fmt.Sprintf("ssh: disconnect reason %d: %s", d.Reason, d.Message) + return fmt.Sprintf("ssh: disconnect, reason %d: %s", d.Reason, d.Message) } // See RFC 4253, section 7.1. @@ -124,6 +125,10 @@ type userAuthRequestMsg struct { Payload []byte `ssh:"rest"` } +// Used for debug printouts of packets. +type userAuthSuccessMsg struct { +} + // See RFC 4252, section 5.1 const msgUserAuthFailure = 51 @@ -158,6 +163,13 @@ type channelOpenMsg struct { const msgChannelExtendedData = 95 const msgChannelData = 94 +// Used for debug print outs of packets. +type channelDataMsg struct { + PeersId uint32 `sshtype:"94"` + Length uint32 + Rest []byte `ssh:"rest"` +} + // See RFC 4254, section 5.1. const msgChannelOpenConfirm = 91 @@ -255,17 +267,19 @@ type userAuthPubKeyOkMsg struct { PubKey []byte } -// typeTag returns the type byte for the given type. The type should -// be struct. -func typeTag(structType reflect.Type) byte { - var tag byte - var tagStr string - tagStr = structType.Field(0).Tag.Get("sshtype") - i, err := strconv.Atoi(tagStr) - if err == nil { - tag = byte(i) +// typeTags returns the possible type bytes for the given reflect.Type, which +// should be a struct. The possible values are separated by a '|' character. +func typeTags(structType reflect.Type) (tags []byte) { + tagStr := structType.Field(0).Tag.Get("sshtype") + + for _, tag := range strings.Split(tagStr, "|") { + i, err := strconv.Atoi(tag) + if err == nil { + tags = append(tags, byte(i)) + } } - return tag + + return tags } func fieldError(t reflect.Type, field int, problem string) error { @@ -279,19 +293,34 @@ var errShortRead = errors.New("ssh: short read") // Unmarshal parses data in SSH wire format into a structure. The out // argument should be a pointer to struct. If the first member of the -// struct has the "sshtype" tag set to a number in decimal, the packet -// must start that number. In case of error, Unmarshal returns a -// ParseError or UnexpectedMessageError. +// struct has the "sshtype" tag set to a '|'-separated set of numbers +// in decimal, the packet must start with one of those numbers. In +// case of error, Unmarshal returns a ParseError or +// UnexpectedMessageError. func Unmarshal(data []byte, out interface{}) error { v := reflect.ValueOf(out).Elem() structType := v.Type() - expectedType := typeTag(structType) + expectedTypes := typeTags(structType) + + var expectedType byte + if len(expectedTypes) > 0 { + expectedType = expectedTypes[0] + } + if len(data) == 0 { return parseError(expectedType) } - if expectedType > 0 { - if data[0] != expectedType { - return unexpectedMessageError(expectedType, data[0]) + + if len(expectedTypes) > 0 { + goodType := false + for _, e := range expectedTypes { + if e > 0 && data[0] == e { + goodType = true + break + } + } + if !goodType { + return fmt.Errorf("ssh: unexpected message type %d (expected one of %v)", data[0], expectedTypes) } data = data[1:] } @@ -375,7 +404,7 @@ func Unmarshal(data []byte, out interface{}) error { return fieldError(structType, i, "pointer to unsupported type") } default: - return fieldError(structType, i, "unsupported type") + return fieldError(structType, i, fmt.Sprintf("unsupported type: %v", t)) } } @@ -398,9 +427,9 @@ func Marshal(msg interface{}) []byte { func marshalStruct(out []byte, msg interface{}) []byte { v := reflect.Indirect(reflect.ValueOf(msg)) - msgType := typeTag(v.Type()) - if msgType > 0 { - out = append(out, msgType) + msgTypes := typeTags(v.Type()) + if len(msgTypes) > 0 { + out = append(out, msgTypes[0]) } for i, n := 0, v.NumField(); i < n; i++ { @@ -687,6 +716,8 @@ func decode(packet []byte) (interface{}, error) { msg = new(kexDHReplyMsg) case msgUserAuthRequest: msg = new(userAuthRequestMsg) + case msgUserAuthSuccess: + return new(userAuthSuccessMsg), nil case msgUserAuthFailure: msg = new(userAuthFailureMsg) case msgUserAuthPubKeyOk: @@ -699,6 +730,8 @@ func decode(packet []byte) (interface{}, error) { msg = new(globalRequestFailureMsg) case msgChannelOpen: msg = new(channelOpenMsg) + case msgChannelData: + msg = new(channelDataMsg) case msgChannelOpenConfirm: msg = new(channelOpenConfirmMsg) case msgChannelOpenFailure: diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/mux.go b/vendor/golang.org/x/crypto/ssh/mux.go similarity index 92% rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/mux.go rename to vendor/golang.org/x/crypto/ssh/mux.go index 321880a..fb54c8b 100644 --- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/mux.go +++ b/vendor/golang.org/x/crypto/ssh/mux.go @@ -131,6 +131,9 @@ func newMux(p packetConn) *mux { func (m *mux) sendMessage(msg interface{}) error { p := Marshal(msg) + if debugMux { + log.Printf("send global(%d): %#v", m.chanList.offset, msg) + } return m.conn.writePacket(p) } @@ -175,18 +178,6 @@ func (m *mux) ackRequest(ok bool, data []byte) error { return m.sendMessage(globalRequestFailureMsg{Data: data}) } -// TODO(hanwen): Disconnect is a transport layer message. We should -// probably send and receive Disconnect somewhere in the transport -// code. - -// Disconnect sends a disconnect message. -func (m *mux) Disconnect(reason uint32, message string) error { - return m.sendMessage(disconnectMsg{ - Reason: reason, - Message: message, - }) -} - func (m *mux) Close() error { return m.conn.Close() } @@ -239,8 +230,6 @@ func (m *mux) onePacket() error { case msgNewKeys: // Ignore notification of key change. return nil - case msgDisconnect: - return m.handleDisconnect(packet) case msgChannelOpen: return m.handleChannelOpen(packet) case msgGlobalRequest, msgRequestSuccess, msgRequestFailure: @@ -260,18 +249,6 @@ func (m *mux) onePacket() error { return ch.handlePacket(packet) } -func (m *mux) handleDisconnect(packet []byte) error { - var d disconnectMsg - if err := Unmarshal(packet, &d); err != nil { - return err - } - - if debugMux { - log.Printf("caught disconnect: %v", d) - } - return &d -} - func (m *mux) handleGlobalPacket(packet []byte) error { msg, err := decode(packet) if err != nil { diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/server.go b/vendor/golang.org/x/crypto/ssh/server.go similarity index 99% rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/server.go rename to vendor/golang.org/x/crypto/ssh/server.go index 4781eb7..d530501 100644 --- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/server.go +++ b/vendor/golang.org/x/crypto/ssh/server.go @@ -188,7 +188,7 @@ func (s *connection) serverHandshake(config *ServerConfig) (*Permissions, error) tr := newTransport(s.sshConn.conn, config.Rand, false /* not client */) s.transport = newServerTransport(tr, s.clientVersion, s.serverVersion, config) - if err := s.transport.requestKeyChange(); err != nil { + if err := s.transport.requestInitialKeyChange(); err != nil { return nil, err } diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/session.go b/vendor/golang.org/x/crypto/ssh/session.go similarity index 98% rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/session.go rename to vendor/golang.org/x/crypto/ssh/session.go index fd10cd1..09eb009 100644 --- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/session.go +++ b/vendor/golang.org/x/crypto/ssh/session.go @@ -601,5 +601,12 @@ func (w Waitmsg) Lang() string { } func (w Waitmsg) String() string { - return fmt.Sprintf("Process exited with: %v. Reason was: %v (%v)", w.status, w.msg, w.signal) + str := fmt.Sprintf("Process exited with status %v", w.status) + if w.signal != "" { + str += fmt.Sprintf(" from signal %v", w.signal) + } + if w.msg != "" { + str += fmt.Sprintf(". Reason was: %v", w.msg) + } + return str } diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/tcpip.go b/vendor/golang.org/x/crypto/ssh/tcpip.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/tcpip.go rename to vendor/golang.org/x/crypto/ssh/tcpip.go diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/transport.go b/vendor/golang.org/x/crypto/ssh/transport.go similarity index 92% rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/transport.go rename to vendor/golang.org/x/crypto/ssh/transport.go index 8351d37..bf7dd61 100644 --- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/transport.go +++ b/vendor/golang.org/x/crypto/ssh/transport.go @@ -39,19 +39,6 @@ type transport struct { rand io.Reader io.Closer - - // Initial H used for the session ID. Once assigned this does - // not change, even during subsequent key exchanges. - sessionID []byte -} - -// getSessionID returns the ID of the SSH connection. The return value -// should not be modified. -func (t *transport) getSessionID() []byte { - if t.sessionID == nil { - panic("session ID not set yet") - } - return t.sessionID } // packetCipher represents a combination of SSH encryption/MAC @@ -81,12 +68,6 @@ type connectionState struct { // both directions are triggered by reading and writing a msgNewKey packet // respectively. func (t *transport) prepareKeyChange(algs *algorithms, kexResult *kexResult) error { - if t.sessionID == nil { - t.sessionID = kexResult.H - } - - kexResult.SessionID = t.sessionID - if ciph, err := newPacketCipher(t.reader.dir, algs.r, kexResult); err != nil { return err } else { @@ -114,12 +95,27 @@ func (s *connectionState) readPacket(r *bufio.Reader) ([]byte, error) { err = errors.New("ssh: zero length packet") } - if len(packet) > 0 && packet[0] == msgNewKeys { - select { - case cipher := <-s.pendingKeyChange: - s.packetCipher = cipher - default: - return nil, errors.New("ssh: got bogus newkeys message.") + if len(packet) > 0 { + switch packet[0] { + case msgNewKeys: + select { + case cipher := <-s.pendingKeyChange: + s.packetCipher = cipher + default: + return nil, errors.New("ssh: got bogus newkeys message.") + } + + case msgDisconnect: + // Transform a disconnect message into an + // error. Since this is lowest level at which + // we interpret message types, doing it here + // ensures that we don't have to handle it + // elsewhere. + var msg disconnectMsg + if err := Unmarshal(packet, &msg); err != nil { + return nil, err + } + return nil, &msg } } From 51f05d5994bc05bf88d0546e398ca50e9ba00b94 Mon Sep 17 00:00:00 2001 From: Wilson Carey Date: Tue, 10 May 2016 14:02:01 -0400 Subject: [PATCH 2/2] Update dependencies --- circle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index a518997..2cfc2cc 100644 --- a/circle.yml +++ b/circle.yml @@ -1,10 +1,10 @@ machine: ruby: - version: 2.0.0-p645 + version: 2.3.0 environment: IMPORT_PATH: "github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME" - PKR_VERSION: 0.9.0 + PKR_VERSION: 0.10.1 PKR_URL: https://releases.hashicorp.com/packer/${PKR_VERSION}/packer_${PKR_VERSION}_linux_amd64.zip dependencies: