Skip to content

Commit

Permalink
Merge pull request #131 from bchavez/master
Browse files Browse the repository at this point in the history
* Makes gomemcached imports consistent
  • Loading branch information
mschoch committed Sep 16, 2014
2 parents 716fecf + 7ad29d1 commit 38bed24
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion backup.go
Expand Up @@ -17,7 +17,7 @@ import (
"time"

"github.com/dustin/go-hashset"
"github.com/dustin/gomemcached"
"github.com/couchbase/gomemcached"

"github.com/couchbaselabs/cbfs/config"
)
Expand Down
2 changes: 1 addition & 1 deletion debug.go
Expand Up @@ -10,7 +10,7 @@ import (
"time"

cb "github.com/couchbaselabs/go-couchbase"
_ "github.com/dustin/gomemcached/debug"
_ "github.com/couchbase/gomemcached/debug"
"github.com/samuel/go-metrics/metrics"
)

Expand Down
2 changes: 1 addition & 1 deletion http.go
Expand Up @@ -14,7 +14,7 @@ import (
"strings"
"time"

"github.com/dustin/gomemcached"
"github.com/couchbase/gomemcached"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion main.go
Expand Up @@ -17,7 +17,7 @@ import (

"github.com/couchbaselabs/cbfs/config"
"github.com/dustin/go-humanize"
"github.com/dustin/gomemcached"
"github.com/couchbase/gomemcached"
"github.com/dustin/httputil"
)

Expand Down

0 comments on commit 38bed24

Please sign in to comment.