From 665251b66f2b4b92bd12811ee5a874abd9afc071 Mon Sep 17 00:00:00 2001
From: "maxim.manuylov" <maxim.manuylov@gmail.com>
Date: Wed, 27 Jul 2016 18:41:59 +0300
Subject: [PATCH] fix deps

---
 init.sh                     |  1 -
 item/item.go                | 16 ++++++++--------
 jongleur/etcd/etcd.go       |  2 +-
 jongleur/regular/regular.go |  2 +-
 vendor/vendor.json          | 10 ----------
 5 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/init.sh b/init.sh
index 5f01989..9513e41 100644
--- a/init.sh
+++ b/init.sh
@@ -7,4 +7,3 @@ rm -rf vendor
 govendor init
 
 govendor fetch github.com/coreos/etcd@=$ETCD_VERSION
-govendor fetch golang.org/x/net/context
diff --git a/item/item.go b/item/item.go
index 5df5213..0cafa36 100644
--- a/item/item.go
+++ b/item/item.go
@@ -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"
@@ -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
 }
 
diff --git a/jongleur/etcd/etcd.go b/jongleur/etcd/etcd.go
index d37ad06..a72cc64 100644
--- a/jongleur/etcd/etcd.go
+++ b/jongleur/etcd/etcd.go
@@ -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"
 )
diff --git a/jongleur/regular/regular.go b/jongleur/regular/regular.go
index 1c73d57..f4870cf 100644
--- a/jongleur/regular/regular.go
+++ b/jongleur/regular/regular.go
@@ -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"
 )
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 860473f..5f24e39 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -2,10 +2,6 @@
 	"comment": "",
 	"ignore": "test",
 	"package": [
-		{
-			"path": "context",
-			"revision": ""
-		},
 		{
 			"checksumSHA1": "C8Ves4/b1PIHL6epPCLE8MQt4Kw=",
 			"path": "github.com/coreos/etcd",
@@ -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"