From a1141b836fe3b5629a8b6b0da5bd4ad4556be7cb Mon Sep 17 00:00:00 2001
From: Marius <maerious@gmail.com>
Date: Sat, 9 Jan 2016 20:44:06 +0100
Subject: [PATCH] Squashed commit of the following:

commit 0203e5c57f397865fd5a95b7f91f5f27fd306431
Author: Marius <maerious@gmail.com>
Date:   Sat Jan 9 20:39:46 2016 +0100

    Update dependencies

commit be5b2b8f62b4644fd9c52a838fe68d98b4eae8e4
Author: Marius <maerious@gmail.com>
Date:   Sat Jan 9 19:17:32 2016 +0100

    Pull dependencies from vendor/ in /home/marius/workspace/go for Go < 1.5

commit e631bbcc59e4c9e5e928b172b4c6aab6eb71274d
Author: Marius <maerious@gmail.com>
Date:   Sat Jan 9 19:15:20 2016 +0100

    Vendor dependencies
---
 .gitmodules                            | 42 +++++++++++++++++---------
 .travis.yml                            |  2 +-
 vendor/github.com/aws/aws-sdk-go       |  2 +-
 vendor/github.com/davecgh/go-spew      |  1 +
 vendor/github.com/go-ini/ini           |  1 +
 vendor/github.com/jmespath/go-jmespath |  1 +
 vendor/github.com/pmezard/go-difflib   |  1 +
 vendor/github.com/stretchr/testify     |  2 +-
 8 files changed, 34 insertions(+), 18 deletions(-)
 create mode 160000 vendor/github.com/davecgh/go-spew
 create mode 160000 vendor/github.com/go-ini/ini
 create mode 160000 vendor/github.com/jmespath/go-jmespath
 create mode 160000 vendor/github.com/pmezard/go-difflib

diff --git a/.gitmodules b/.gitmodules
index 1a190d6..a2f3812 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,27 @@
-[submodule "vendor/github.com/nightlyone/lockfile"]
-	path = vendor/github.com/nightlyone/lockfile
-	url = https://github.com/nightlyone/lockfile.git
-[submodule "vendor/github.com/aws/aws-sdk-go"]
-	path = vendor/github.com/aws/aws-sdk-go
-	url = https://github.com/aws/aws-sdk-go
-[submodule "vendor/github.com/bmizerany/pat"]
-	path = vendor/github.com/bmizerany/pat
-	url = https://github.com/bmizerany/pat
-[submodule "vendor/github.com/golang/mock"]
-	path = vendor/github.com/golang/mock
-	url = https://github.com/golang/mock
-[submodule "vendor/github.com/stretchr/testify"]
-	path = vendor/github.com/stretchr/testify
-	url = https://github.com/stretchr/testify
+[submodule "github.com/bmizerany/pat"]
+  path = vendor/github.com/bmizerany/pat
+  url = https://github.com/bmizerany/pat
+[submodule "github.com/nightlyone/lockfile"]
+  path = vendor/github.com/nightlyone/lockfile
+  url = https://github.com/nightlyone/lockfile
+[submodule "github.com/aws/aws-sdk-go"]
+  path = vendor/github.com/aws/aws-sdk-go
+  url = https://github.com/aws/aws-sdk-go
+[submodule "github.com/go-ini/ini"]
+  path = vendor/github.com/go-ini/ini
+  url = https://github.com/go-ini/ini
+[submodule "github.com/jmespath/go-jmespath"]
+  path = vendor/github.com/jmespath/go-jmespath
+  url = https://github.com/jmespath/go-jmespath
+[submodule "github.com/golang/mock"]
+  path = vendor/github.com/golang/mock
+  url = https://github.com/golang/mock
+[submodule "github.com/stretchr/testify"]
+  path = vendor/github.com/stretchr/testify
+  url = https://github.com/stretchr/testify
+[submodule "github.com/davecgh/go-spew"]
+  path = vendor/github.com/davecgh/go-spew
+  url = https://github.com/davecgh/go-spew
+[submodule "github.com/pmezard/go-difflib"]
+  path = vendor/github.com/pmezard/go-difflib
+  url = https://github.com/pmezard/go-difflib
diff --git a/.travis.yml b/.travis.yml
index 9bd9609..f24aa1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ matrix:
 
 install:
 - export PACKAGES=$(find ./ -maxdepth 1 -type d -not \( -name ".git" -or -name "cmd" -or -name "vendor" -or -name "data" \))
-- go get $PACKAGES
+- rsync -r ./vendor/ $GOPATH/src
 
 script:
 - go test $PACKAGES
diff --git a/vendor/github.com/aws/aws-sdk-go b/vendor/github.com/aws/aws-sdk-go
index c676927..b7b1a09 160000
--- a/vendor/github.com/aws/aws-sdk-go
+++ b/vendor/github.com/aws/aws-sdk-go
@@ -1 +1 @@
-Subproject commit c676927b4f3771ff71c0c0b0cb8cf4575d8d0a65
+Subproject commit b7b1a098eeebcdf7db0af5818e255dc8569b88ce
diff --git a/vendor/github.com/davecgh/go-spew b/vendor/github.com/davecgh/go-spew
new file mode 160000
index 0000000..5215b55
--- /dev/null
+++ b/vendor/github.com/davecgh/go-spew
@@ -0,0 +1 @@
+Subproject commit 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d
diff --git a/vendor/github.com/go-ini/ini b/vendor/github.com/go-ini/ini
new file mode 160000
index 0000000..afbd495
--- /dev/null
+++ b/vendor/github.com/go-ini/ini
@@ -0,0 +1 @@
+Subproject commit afbd495e5aaea13597b5e14fe514ddeaa4d76fc3
diff --git a/vendor/github.com/jmespath/go-jmespath b/vendor/github.com/jmespath/go-jmespath
new file mode 160000
index 0000000..c01cf91
--- /dev/null
+++ b/vendor/github.com/jmespath/go-jmespath
@@ -0,0 +1 @@
+Subproject commit c01cf91b011868172fdcd9f41838e80c9d716264
diff --git a/vendor/github.com/pmezard/go-difflib b/vendor/github.com/pmezard/go-difflib
new file mode 160000
index 0000000..e8554b8
--- /dev/null
+++ b/vendor/github.com/pmezard/go-difflib
@@ -0,0 +1 @@
+Subproject commit e8554b8641db39598be7f6342874b958f12ae1d4
diff --git a/vendor/github.com/stretchr/testify b/vendor/github.com/stretchr/testify
index 67106a5..ac0e581 160000
--- a/vendor/github.com/stretchr/testify
+++ b/vendor/github.com/stretchr/testify
@@ -1 +1 @@
-Subproject commit 67106a5111a06241c8d84952c33214675f51a34a
+Subproject commit ac0e5818a16c41b78daa9b7c4b491eb4be5cc629