Upgrade water dependency again (#3430)

This was already done by #3406 but then got reverted by the go.mod change (#3419)
scionproto · Nov 27, 2019 · 2085e15 · 2085e15
1 parent 51f52bd
commit 2085e15
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -35,7 +35,7 @@ require (
 	github.com/sergi/go-diff v1.0.1-0.20180205163309-da645544ed44
 	github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d
 	github.com/smartystreets/goconvey v1.6.4
-	github.com/songgao/water v0.0.0-20170524165202-99d07fc117af
+	github.com/songgao/water v0.0.0-20190725173103-fd331bda3f4b
 	github.com/spf13/cobra v0.0.3-0.20180408161736-cd30c2a7e91a
 	github.com/spf13/pflag v1.0.1-0.20180403115518-1ce0cc6db402 // indirect
 	github.com/stretchr/testify v1.3.1-0.20190311161405-34c6fa2dc709

diff --git a/go.sum b/go.sum
@@ -111,6 +111,7 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn
 github.com/prometheus/client_golang v1.1.0 h1:BQ53HtBmfOitExawJ6LokA4x8ov/z0SYYb0+HxJfRI8=
 github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -126,8 +127,8 @@ github.com/sergi/go-diff v1.0.1-0.20180205163309-da645544ed44/go.mod h1:0CfEIISq
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/songgao/water v0.0.0-20170524165202-99d07fc117af h1:ubYDIJXsE4CmJ0CB0j57XpQ4s8hdxQhnl/OOpe9EA8s=
-github.com/songgao/water v0.0.0-20170524165202-99d07fc117af/go.mod h1:P5HUIBuIWKbyjl083/loAegFkfbFNx5i2qEP4CNbm7E=
+github.com/songgao/water v0.0.0-20190725173103-fd331bda3f4b h1:+y4hCMc/WKsDbAPsOQZgBSaSZ26uh2afyaWeVg/3s/c=
+github.com/songgao/water v0.0.0-20190725173103-fd331bda3f4b/go.mod h1:P5HUIBuIWKbyjl083/loAegFkfbFNx5i2qEP4CNbm7E=
 github.com/spf13/cobra v0.0.3-0.20180408161736-cd30c2a7e91a h1:fkxjXeX1GqxICegQuav3Fpff2VNAMfqaPWZvI+dRqa0=
 github.com/spf13/cobra v0.0.3-0.20180408161736-cd30c2a7e91a/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/pflag v1.0.1-0.20180403115518-1ce0cc6db402 h1:PzXGtoglK0gKAmoFi5ec8tZKKnTTxJM+3i7w/qw+Hf0=

diff --git a/go_deps.bzl b/go_deps.bzl
@@ -378,8 +378,8 @@ def go_deps():
     go_repository(
         name = "com_github_songgao_water",
         importpath = "github.com/songgao/water",
-        sum = "h1:ubYDIJXsE4CmJ0CB0j57XpQ4s8hdxQhnl/OOpe9EA8s=",
-        version = "v0.0.0-20170524165202-99d07fc117af",
+        sum = "h1:+y4hCMc/WKsDbAPsOQZgBSaSZ26uh2afyaWeVg/3s/c=",
+        version = "v0.0.0-20190725173103-fd331bda3f4b",
     )
     go_repository(
         name = "com_github_spf13_cobra",