Merge pull request #507 from restic/debug-minio-on-darwin

Update minio-go

.travis.yml

@@ -5,7 +5,7 @@ go:
   - 1.3.3
   - 1.4.3
   - 1.5.4
-  - 1.6.1
+  - 1.6.2
 
 os:
   - linux
@@ -33,6 +33,7 @@ install:
   - export GOBIN="$GOPATH/bin"
   - export PATH="$PATH:$GOBIN"
   - go env
+  - ulimit -n 2048
 
 script:
   - go run run_integration_tests.go

Vagrantfile

@@ -87,16 +87,16 @@ Vagrant.configure(2) do |config|
   # fix permissions on synced folder
   config.vm.provision "fix perms", :type => :shell, :inline => fix_perms
 
-  # fix network card
-  config.vm.provider "virtualbox" do |v|
-    v.customize ["modifyvm", :id, "--nictype1", "virtio"]
-  end
-
   config.vm.define "linux" do |b|
     b.vm.box = "ubuntu/trusty64"
     b.vm.provision "packages linux", :type => :shell, :inline => packages_linux
     b.vm.provision "install gimme",  :type => :shell, :inline => install_gimme
     b.vm.provision "prepare user",   :type => :shell, :privileged => false, :inline => prepare_user("linux")
+
+    # fix network card
+    config.vm.provider "virtualbox" do |v|
+      v.customize ["modifyvm", :id, "--nictype1", "virtio"]
+    end
   end
 
   config.vm.define "freebsd" do |b|

src/restic/backend/s3/s3.go

@@ -16,7 +16,7 @@ const connLimit = 10
 
 // s3 is a backend which stores the data on an S3 endpoint.
 type s3 struct {
-	client     minio.CloudStorageClient
+	client     *minio.Client
 	connChan   chan struct{}
 	bucketname string
 	prefix     string
@@ -39,7 +39,7 @@ func Open(cfg Config) (backend.Backend, error) {
 		debug.Log("s3.Open", "BucketExists(%v) returned err %v, trying to create the bucket", cfg.Bucket, err)
 
 		// create new bucket with default ACL in default region
-		err = client.MakeBucket(cfg.Bucket, "", "")
+		err = client.MakeBucket(cfg.Bucket, "")
 
 		if err != nil {
 			return nil, err

vendor/manifest

@@ -28,8 +28,8 @@
 		{
 			"importpath": "github.com/minio/minio-go",
 			"repository": "https://github.com/minio/minio-go",
-			"revision": "a4cd3caabd5f9c35ac100110eb60c2b80798f1af",
-			"branch": "HEAD"
+			"revision": "867b27701ad16db4a9f4dad40d28187ca8433ec9",
+			"branch": "master"
 		},
 		{
 			"importpath": "github.com/pkg/sftp",