Skip to content

Commit

Permalink
Merge pull request #74 from v3io/development
Browse files Browse the repository at this point in the history 
dev -> master
  • Loading branch information
Gal Topper authored Aug 30, 2020
2 parents a284f30 + 64933db commit d2e54ce
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 16 deletions.
6 changes: 3 additions & 3 deletions functions/ingest/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/nuclio/zap v0.0.3 // indirect
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.5.1 // indirect
github.com/v3io/v3io-tsdb v0.10.9
github.com/v3io/v3io-tsdb v0.10.12
github.com/valyala/fasthttp v1.14.0 // indirect
golang.org/x/text v0.3.2 // indirect
google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90 // indirect
Expand All @@ -20,6 +20,6 @@ require (
)

replace (
github.com/v3io/frames => github.com/v3io/frames v0.7.33
github.com/v3io/v3io-tsdb => github.com/v3io/v3io-tsdb v0.10.11
github.com/v3io/frames => github.com/v3io/frames v0.7.36
github.com/v3io/v3io-tsdb => github.com/v3io/v3io-tsdb v0.10.12
)
9 changes: 4 additions & 5 deletions functions/ingest/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,12 @@ github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/tinylib/msgp v1.1.1 h1:TnCZ3FIuKeaIy+F45+Cnp+caqdXGy4z74HvwXN+570Y=
github.com/tinylib/msgp v1.1.1/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
github.com/v3io/frames v0.7.33 h1:xkxVC79JcvV9IIBuXlXlvGNK1Rohp1skYh9LsXtnl68=
github.com/v3io/frames v0.7.33/go.mod h1:pg88Tq3a9APkqyQXuUlGYgaBIAt4nn+dMDZATZJaaIo=
github.com/v3io/v3io-go v0.1.5-0.20200416113214-f1b82b9a8e82/go.mod h1:D0W1tjsVgcp4xk3ZI2fjKTKaOpYJLewN1BPN0x2osO4=
github.com/v3io/frames v0.7.36 h1:vWLJWbjvKMgWbCNrMj79wfKStcmvuAkh2UyfNGPIRfs=
github.com/v3io/frames v0.7.36/go.mod h1:qUW5rLv+DK4pC0t52685E9HxqDBg3VFgourbbYfRmaI=
github.com/v3io/v3io-go v0.1.9 h1:etkrrRmrI++i8sxGfK/+13f41TxIMohYeZHwVUM62vw=
github.com/v3io/v3io-go v0.1.9/go.mod h1:5poBlcjZG5TiexRTYI44PE6tHzZz5Z60w+iS899pWtc=
github.com/v3io/v3io-tsdb v0.10.11 h1:Ih93470TZyXmmSTaunMdSJSVHyIqCP4cbuaedJnG0Ks=
github.com/v3io/v3io-tsdb v0.10.11/go.mod h1:kp586KxTfROIGwb/nzNxwDbX2Wterxro+HbiZHmK548=
github.com/v3io/v3io-tsdb v0.10.12 h1:+AfPHFJVxzpKtng0Hiz256ef9abzIwKwPuzB+0jG7w8=
github.com/v3io/v3io-tsdb v0.10.12/go.mod h1:kp586KxTfROIGwb/nzNxwDbX2Wterxro+HbiZHmK548=
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
github.com/valyala/fasthttp v1.2.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s=
Expand Down
6 changes: 3 additions & 3 deletions functions/query/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.5.1
github.com/v3io/v3io-go v0.1.9
github.com/v3io/v3io-tsdb v0.10.9
github.com/v3io/v3io-tsdb v0.10.12
github.com/valyala/fasthttp v1.14.0 // indirect
golang.org/x/text v0.3.2 // indirect
google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90 // indirect
Expand All @@ -21,6 +21,6 @@ require (
)

replace (
github.com/v3io/frames => github.com/v3io/frames v0.7.33
github.com/v3io/v3io-tsdb => github.com/v3io/v3io-tsdb v0.10.11
github.com/v3io/frames => github.com/v3io/frames v0.7.36
github.com/v3io/v3io-tsdb => github.com/v3io/v3io-tsdb v0.10.12
)
9 changes: 4 additions & 5 deletions functions/query/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,12 @@ github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/tinylib/msgp v1.1.1 h1:TnCZ3FIuKeaIy+F45+Cnp+caqdXGy4z74HvwXN+570Y=
github.com/tinylib/msgp v1.1.1/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
github.com/v3io/frames v0.7.33 h1:xkxVC79JcvV9IIBuXlXlvGNK1Rohp1skYh9LsXtnl68=
github.com/v3io/frames v0.7.33/go.mod h1:pg88Tq3a9APkqyQXuUlGYgaBIAt4nn+dMDZATZJaaIo=
github.com/v3io/v3io-go v0.1.5-0.20200416113214-f1b82b9a8e82/go.mod h1:D0W1tjsVgcp4xk3ZI2fjKTKaOpYJLewN1BPN0x2osO4=
github.com/v3io/frames v0.7.36 h1:vWLJWbjvKMgWbCNrMj79wfKStcmvuAkh2UyfNGPIRfs=
github.com/v3io/frames v0.7.36/go.mod h1:qUW5rLv+DK4pC0t52685E9HxqDBg3VFgourbbYfRmaI=
github.com/v3io/v3io-go v0.1.9 h1:etkrrRmrI++i8sxGfK/+13f41TxIMohYeZHwVUM62vw=
github.com/v3io/v3io-go v0.1.9/go.mod h1:5poBlcjZG5TiexRTYI44PE6tHzZz5Z60w+iS899pWtc=
github.com/v3io/v3io-tsdb v0.10.11 h1:Ih93470TZyXmmSTaunMdSJSVHyIqCP4cbuaedJnG0Ks=
github.com/v3io/v3io-tsdb v0.10.11/go.mod h1:kp586KxTfROIGwb/nzNxwDbX2Wterxro+HbiZHmK548=
github.com/v3io/v3io-tsdb v0.10.12 h1:+AfPHFJVxzpKtng0Hiz256ef9abzIwKwPuzB+0jG7w8=
github.com/v3io/v3io-tsdb v0.10.12/go.mod h1:kp586KxTfROIGwb/nzNxwDbX2Wterxro+HbiZHmK548=
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
github.com/valyala/fasthttp v1.2.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s=
Expand Down

0 comments on commit d2e54ce

Please sign in to comment.