Skip to content

Commit

Permalink
fix deps
Browse files Browse the repository at this point in the history
  • Loading branch information
maxmanuylov committed Jul 27, 2016
1 parent 74ca7d2 commit 665251b
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 21 deletions.
1 change: 0 additions & 1 deletion init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ rm -rf vendor
govendor init

govendor fetch github.com/coreos/etcd@=$ETCD_VERSION
govendor fetch golang.org/x/net/context
16 changes: 8 additions & 8 deletions item/item.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"errors"
"fmt"
etcd "github.com/coreos/etcd/client"
"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context"
"github.com/maxmanuylov/jongleur/util"
"golang.org/x/net/context"
"log"
"net"
"net/http"
Expand Down Expand Up @@ -103,15 +103,15 @@ func (config *Config) createRuntimeData(logger *log.Logger) (*runtimeData, error
}

return &runtimeData{
periodDuration,
logger,
&http.Client{
period: periodDuration,
logger: logger,
httpClient: &http.Client{
Timeout: semiPeriodDuration,
},
config.Health.Value,
etcdClient,
fmt.Sprintf("%s/%s", util.EtcdItemsKey(config.Type), config.Host),
periodDuration * time.Duration(config.Tolerance) + semiPeriodDuration,
healthUrl: config.Health.Value,
etcdClient: etcdClient,
etcdKey: fmt.Sprintf("%s/%s", util.EtcdItemsKey(config.Type), config.Host),
ttl: periodDuration * time.Duration(config.Tolerance) + semiPeriodDuration,
}, nil
}

Expand Down
2 changes: 1 addition & 1 deletion jongleur/etcd/etcd.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"github.com/coreos/etcd/discovery"
"github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/pkg/types"
"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context"
"github.com/maxmanuylov/jongleur/jongleur"
"github.com/maxmanuylov/jongleur/util"
"golang.org/x/net/context"
"net/http"
"net/url"
)
Expand Down
2 changes: 1 addition & 1 deletion jongleur/regular/regular.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package regular
import (
"errors"
etcd "github.com/coreos/etcd/client"
"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context"
"github.com/maxmanuylov/jongleur/jongleur"
"github.com/maxmanuylov/jongleur/util"
"golang.org/x/net/context"
"strconv"
"strings"
)
Expand Down
10 changes: 0 additions & 10 deletions vendor/vendor.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
"comment": "",
"ignore": "test",
"package": [
{
"path": "context",
"revision": ""
},
{
"checksumSHA1": "C8Ves4/b1PIHL6epPCLE8MQt4Kw=",
"path": "github.com/coreos/etcd",
Expand Down Expand Up @@ -699,12 +695,6 @@
"path": "github.com/petar/GoLLRB/llrb",
"revision": "53be0d36a84c2a886ca057d34b6aa4468df9ccb4",
"revisionTime": "2013-04-27T21:51:48Z"
},
{
"checksumSHA1": "9jjO5GjLa0XF/nfWihF02RoH4qc=",
"path": "golang.org/x/net/context",
"revision": "4d38db76854b199960801a1734443fd02870d7e1",
"revisionTime": "2016-07-20T03:23:22Z"
}
],
"rootPath": "github.com/maxmanuylov/jongleur"
Expand Down

0 comments on commit 665251b

Please sign in to comment.