merged upstream changes from main

dell · Jan 27, 2022 · 5b537dc · 5b537dc
1 parent cf3751d
commit 5b537dc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/go.mod b/go.mod
@@ -27,7 +27,7 @@ require (
 )
 
 replace (
-	github.com/dell/goisilon v1.5.0 => ../gopowerscale
+	github.com/dell/goisilon v1.5.0 => github.com/dell/goisilon v0.0.0-20220126122911-e1a58045d14b
 	k8s.io/api => k8s.io/api v0.20.2
 	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.2
 	k8s.io/apimachinery => k8s.io/apimachinery v0.20.2

diff --git a/go.sum b/go.sum
@@ -162,8 +162,8 @@ github.com/dell/gocsi v1.5.0 h1:qi2T6H6JHDo9sJEw24jo6Z88fJszBXfQc3lxOBaUijo=
 github.com/dell/gocsi v1.5.0/go.mod h1:nIsIXXB5JpAvOQ0//gtPGULC2+NUddpi5qwpBeMhiLs=
 github.com/dell/gofsutil v1.6.0 h1:u5PiMJIyecAWpSlPloov1/3LF5OWrcjJwoFF8dWkjcA=
 github.com/dell/gofsutil v1.6.0/go.mod h1:98Wpcg7emz4iGgY16fd4MKpnal2SX2hBiwP5ghHlvhg=
-github.com/dell/goisilon v1.5.0 h1:DyIxpc6t74eySvr/WbOIo3QvdcqC+ZhW29e8WVVAYiY=
-github.com/dell/goisilon v1.5.0/go.mod h1:X6Xizkcr0K4soNlM26rK/KMF95VI/StxL1GHanHm1UQ=
+github.com/dell/goisilon v0.0.0-20220126122911-e1a58045d14b h1:HiiqSaQkv+GnEQM3w/XRkqsK9PrhtTBpDvcvIa1w2dw=
+github.com/dell/goisilon v0.0.0-20220126122911-e1a58045d14b/go.mod h1:X6Xizkcr0K4soNlM26rK/KMF95VI/StxL1GHanHm1UQ=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=

diff --git a/service/step_defs_test.go b/service/step_defs_test.go
@@ -2485,4 +2485,3 @@ func (f *feature) iCallNodeGetInfoWithNoFQDN() error {
 	}
 	return nil
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2485,4 +2485,3 @@ func (f *feature) iCallNodeGetInfoWithNoFQDN() error {
		}
		return nil
		}