upgrade to go1.14.6 (spiffe#1741)

Signed-off-by: Andrew Harding <[email protected]>
Taranasaur · Jul 23, 2020 · a4cdde0 · a4cdde0
1 parent 4f1b7f7
commit a4cdde0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.14.4
+1.14.6
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ services:
 language: go
 
 go:
-  - 1.14.4
+  - 1.14.6
 
 cache:
   directories:

diff --git a/pkg/server/plugin/datastore/sql/sql_test.go b/pkg/server/plugin/datastore/sql/sql_test.go
@@ -2795,7 +2795,7 @@ func (s *PluginSuite) TestConfigure() {
 			giveDBConfig: `
 			max_open_conns = 1000
 			max_idle_conns = 50
-			conn_max_lifetime = "1ms"
+			conn_max_lifetime = "10s"
 			`,
 			expectMaxOpenConns: 1000,
 			expectIdle:         50,
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ services: @@
     language: go
     go:
-      - 1.14.4
+      - 1.14.6
     cache:
       directories:
@@ Expand Down @@