Skip to content

Commit

Permalink
Update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
sapk committed Dec 15, 2017
1 parent 1ded20e commit ea4f305
Show file tree
Hide file tree
Showing 15 changed files with 16 additions and 20 deletions.
9 changes: 3 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "vendor/github.com/Sirupsen/logrus"]
path = vendor/github.com/Sirupsen/logrus
url = https://github.com/Sirupsen/logrus
[submodule "vendor/github.com/docker/go-plugins-helpers"]
path = vendor/github.com/docker/go-plugins-helpers
url = https://github.com/docker/go-plugins-helpers
Expand Down Expand Up @@ -40,9 +37,6 @@
[submodule "vendor/github.com/pelletier/go-toml"]
path = vendor/github.com/pelletier/go-toml
url = https://github.com/pelletier/go-toml
[submodule "vendor/github.com/pelletier/go-buffruneio"]
path = vendor/github.com/pelletier/go-buffruneio
url = https://github.com/pelletier/go-buffruneio
[submodule "vendor/github.com/spf13/afero"]
path = vendor/github.com/spf13/afero
url = https://github.com/spf13/afero
Expand All @@ -61,3 +55,6 @@
[submodule "vendor/golang.org/x/crypto"]
path = vendor/golang.org/x/crypto
url = https://go.googlesource.com/crypto
[submodule "vendor/github.com/sirupsen/logrus"]
path = vendor/github.com/sirupsen/logrus
url = https://github.com/sirupsen/logrus
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ deps:

update-deps: dev-deps
@echo -e "$(OK_COLOR)==> Updating all dependencies ...$(NO_COLOR)"
$(GOPATH)/bin/vendetta -n $(APP_PACKAGE) -u
$(GOPATH)/bin/vendetta -n $(APP_PACKAGE) -u -p
#@go get -d -v -u ./...


Expand Down
2 changes: 1 addition & 1 deletion common/common_driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"sync"

log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"

"github.com/docker/go-plugins-helpers/volume"
)
Expand Down
4 changes: 2 additions & 2 deletions gluster/driver/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (

"github.com/sapk/docker-volume-gluster/common"

log "github.com/Sirupsen/logrus"
"github.com/docker/go-plugins-helpers/volume"
log "github.com/sirupsen/logrus"
"github.com/spf13/viper"
)

Expand Down Expand Up @@ -268,7 +268,7 @@ func (d *GlusterDriver) Mount(r *volume.MountRequest) (*volume.MountResponse, er
select {
case err := <-done:
return nil, err
case <-time.After(time.Second * 15):
case <-time.After(time.Second * 5):
m.SetProcess(c)
common.AddN(1, v, m)
return &volume.MountResponse{Mountpoint: m.GetPath()}, d.SaveConfig()
Expand Down
2 changes: 1 addition & 1 deletion gluster/driver/tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"regexp"
"strings"

log "github.com/Sirupsen/logrus"
"github.com/docker/go-plugins-helpers/volume"
log "github.com/sirupsen/logrus"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion gluster/gluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"os"
"path/filepath"

log "github.com/Sirupsen/logrus"
"github.com/docker/go-plugins-helpers/volume"
"github.com/sapk/docker-volume-gluster/gluster/driver"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion gluster/integration/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"testing"
"time"

log "github.com/Sirupsen/logrus"
"github.com/docker/go-plugins-helpers/volume"
"github.com/sapk/docker-volume-gluster/gluster"
"github.com/sapk/docker-volume-gluster/gluster/driver"
log "github.com/sirupsen/logrus"
)

const timeInterval = 2 * time.Second
Expand Down
1 change: 0 additions & 1 deletion vendor/github.com/Sirupsen/logrus
Submodule logrus deleted from 95cd2b
1 change: 0 additions & 1 deletion vendor/github.com/pelletier/go-buffruneio
Submodule go-buffruneio deleted from c37440
1 change: 1 addition & 0 deletions vendor/github.com/sirupsen/logrus
Submodule logrus added at d68221
2 changes: 1 addition & 1 deletion vendor/github.com/spf13/cobra
Submodule cobra updated 5 files
+8 −0 README.md
+2 −1 cobra.go
+69 −2 command.go
+57 −0 command_test.go
+2 −2 doc/md_docs.go
2 changes: 1 addition & 1 deletion vendor/github.com/spf13/viper
Submodule viper updated 4 files
+3 −2 remote/remote.go
+0 −62 util.go
+212 −11 viper.go
+186 −1 viper_test.go
2 changes: 1 addition & 1 deletion vendor/golang.org/x/net
Submodule net updated from a8b929 to d866cf
2 changes: 1 addition & 1 deletion vendor/golang.org/x/sys
Submodule sys updated from 8b4580 to d5840a
2 changes: 1 addition & 1 deletion vendor/golang.org/x/text
Submodule text updated from 75cc3c to d5a922

0 comments on commit ea4f305

Please sign in to comment.