Merge pull request #503 from erikwilson/update-vendor-kvsql

trash.lock

@@ -104,6 +104,8 @@ import:
   version: v1.3.1-1-gf12c6236fe7b5c
 - package: github.com/ghodss/yaml
   version: v1.0.0
+- package: github.com/go-sql-driver/mysql
+  version: v1.4.1
 - package: github.com/godbus/dbus
   version: c7fdd8b5cd55e87b4e1f4e372cdb1db61dd6c66f
 - package: github.com/gogo/googleapis
@@ -140,7 +142,8 @@ import:
 - package: github.com/hashicorp/golang-lru
   version: v0.5.0
 - package: github.com/ibuildthecloud/kvsql
-  version: 0e798b1475327aadf3b8da5d2d1f99bb93dfd667
+  version: d37dd2b0829b44a4964e48c9396e14b0536fefb6
+  repo: https://github.com/erikwilson/rancher-kvsql.git
 - package: github.com/imdario/mergo
   version: v0.3.5
 - package: github.com/inconshreveable/mousetrap
@@ -158,6 +161,8 @@ import:
 - package: github.com/kubernetes-sigs/cri-tools
   version: c465773e3ad8c941d1756c0a467d550b04a8f65b
   repo: https://github.com/ibuildthecloud/cri-tools.git
+- package: github.com/lib/pq
+  version: v1.1.1
 - package: github.com/liggitt/tabwriter
   version: 89fcab3d43de07060e4fd4c1547430ed57e87f24
 - package: github.com/lithammer/dedent

vendor.conf

@@ -122,7 +122,8 @@ golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4
 golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631
 gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
 gopkg.in/yaml.v2 v2.2.1
-github.com/ibuildthecloud/kvsql 788464096f5af361d166858efccf26c12dc5b427
+#github.com/ibuildthecloud/kvsql 788464096f5af361d166858efccf26c12dc5b427
+github.com/ibuildthecloud/kvsql d37dd2b0829b44a4964e48c9396e14b0536fefb6 https://github.com/erikwilson/rancher-kvsql.git
 
 # rootless
 github.com/rootless-containers/rootlesskit  893c1c3de71f54c301fdb85a7c0dd15c1933c159

vendor/github.com/ibuildthecloud/kvsql/clientv3/driver/watcher.go

@@ -2,7 +2,6 @@ package driver
 
 import (
 	"context"
-	"io"
 	"strings"
 )
 
@@ -94,10 +93,9 @@ func start(watchResponses chan Event) {
 }
 
 func sendErrorAndClose(watchResponses chan Event, err error) {
-	if err == nil {
-		err = io.EOF
+	if err != nil {
+		watchResponses <- Event{Err: err}
 	}
-	watchResponses <- Event{Err: err}
 	close(watchResponses)
 }