deps: overrides to use go1.14 branches

Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
hyperledger · Feb 18, 2021 · a7f2b15 · a7f2b15
1 parent 999051d
commit a7f2b15
Show file tree

Hide file tree

Showing 221 changed files with 64,976 additions and 9,819 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -102,7 +102,7 @@ noverify = [
   name = "github.com/syndtr/goleveldb"
 
 [[constraint]]
-  branch = "master"
+  branch = "release-branch.go1.14"
   name = "golang.org/x/crypto"
 
 [[constraint]]
@@ -117,6 +117,10 @@ noverify = [
   branch = "master"
   name = "golang.org/x/sync"
 
+[[override]]
+  branch = "release-branch.go1.14-std"
+  name = "golang.org/x/sys"
+
 [[constraint]]
   name = "golang.org/x/tools"
   branch = "release-branch.go1.14"

diff --git a/vendor/golang.org/x/crypto/ssh/terminal/terminal.go b/vendor/golang.org/x/crypto/ssh/terminal/terminal.go
diff --git a/vendor/golang.org/x/sys/cpu/asm_aix_ppc64.s b/vendor/golang.org/x/sys/cpu/asm_aix_ppc64.s
diff --git a/vendor/golang.org/x/sys/cpu/byteorder.go b/vendor/golang.org/x/sys/cpu/byteorder.go
diff --git a/vendor/golang.org/x/sys/cpu/cpu.go b/vendor/golang.org/x/sys/cpu/cpu.go
diff --git a/vendor/golang.org/x/sys/cpu/cpu_aix_ppc64.go b/vendor/golang.org/x/sys/cpu/cpu_aix_ppc64.go
diff --git a/vendor/golang.org/x/sys/cpu/cpu_arm.go b/vendor/golang.org/x/sys/cpu/cpu_arm.go
diff --git a/vendor/golang.org/x/sys/cpu/cpu_gc_s390x.go b/vendor/golang.org/x/sys/cpu/cpu_gc_s390x.go
diff --git a/vendor/golang.org/x/sys/cpu/cpu_gccgo_s390x.go b/vendor/golang.org/x/sys/cpu/cpu_gccgo_s390x.go
diff --git a/vendor/golang.org/x/sys/cpu/cpu_linux.go b/vendor/golang.org/x/sys/cpu/cpu_linux.go