Merge pull request #283 from gshatz/manual-merge-to-master

Manual merge to master
v3io · Sep 1, 2019 · 7afcf07 · 7afcf07
2 parents 9120e33 + c908527
commit 7afcf07
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/clients/py/v3io_frames/http.py b/clients/py/v3io_frames/http.py
@@ -74,7 +74,7 @@ def _read(self, backend, table, query, columns, filter, group_by, limit,
             'limit': limit,
             'data_format': data_format,
             'row_layout': row_layout,
-            'max_in_message': max_in_message,
+            'message_limit': max_in_message,
             'marker': marker,
         }
 

diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/nuclio/logger v0.0.1
 	github.com/nuclio/zap v0.0.2
 	github.com/pkg/errors v0.8.1
-	github.com/v3io/v3io-go v0.0.0-20190826150152-beb22c4a945d8f1d9765639a06b2116756146b15
+	github.com/v3io/v3io-go v0.0.5-0.20190826150152-1f2c9a9a61cb
 	github.com/v3io/v3io-tsdb v0.9.9
 	github.com/valyala/fasthttp v1.2.0
 	github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2

diff --git a/go.sum b/go.sum
@@ -79,21 +79,12 @@ github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDW
 github.com/v3io/frames v0.0.0-20190328123118-1dad1ff610509e7b087d9cd390ed1b452caecf15/go.mod h1:6aKW4Wl4A+gQhXH0JRCVOLgwvcrLyk+fqEpemuie094=
 github.com/v3io/sqlparser v0.0.0-20190306105200-4d7273501871 h1:myF4tU/HdFWU1UzMdf16cHRbownzsyvL7VKIHqkrSvo=
 github.com/v3io/sqlparser v0.0.0-20190306105200-4d7273501871/go.mod h1:QD2Bo64oyTWzeV8RFehXS0hZEDFgOK99/h2a6ErRu6E=
-github.com/v3io/v3io-go v0.0.0-20180415000000-1486c75b0e590a14580f7d9b6cef7a944a231ca7/go.mod h1:MHc+d/Jg/y8lV4B9sgwTvuS3tEE9wS+kqtU0+D0Sr78=
-github.com/v3io/v3io-go v0.0.0-20190708180000-beb22c4a945d8f1d9765639a06b2116756146b15 h1:BpFK417nsy36IWMQAJtYz5vjr1WZiJUXh8qMYCWgqx8=
-github.com/v3io/v3io-go v0.0.0-20190708180000-beb22c4a945d8f1d9765639a06b2116756146b15/go.mod h1:IFb6dJiyvJnOjXUoCoPJ5UViaYjgVYmqJb4fD1qDeLk=
 github.com/v3io/v3io-go v0.0.0-20190826150152-1f2c9a9a61cb715410a35662f5ddab2b306f95e7/go.mod h1:IFb6dJiyvJnOjXUoCoPJ5UViaYjgVYmqJb4fD1qDeLk=
-github.com/v3io/v3io-go v0.0.0-20190826150152-beb22c4a945d8f1d9765639a06b2116756146b15 h1:CvMkJkw8QFowc96UPv73JWwcg7Ivz9pPFN1liseiGnw=
-github.com/v3io/v3io-go v0.0.0-20190826150152-beb22c4a945d8f1d9765639a06b2116756146b15/go.mod h1:IFb6dJiyvJnOjXUoCoPJ5UViaYjgVYmqJb4fD1qDeLk=
+github.com/v3io/v3io-go v0.0.5-0.20190826150152-1f2c9a9a61cb h1:RGdHh0rnsOZS3D/bc+ic/VFp4UY7THRU9o0mgtEdoP0=
+github.com/v3io/v3io-go v0.0.5-0.20190826150152-1f2c9a9a61cb/go.mod h1:IFb6dJiyvJnOjXUoCoPJ5UViaYjgVYmqJb4fD1qDeLk=
 github.com/v3io/v3io-go-http v0.0.0-20190221115935-53e2b487c9a2 h1:NJc63wM25iS+ci5z7LVwjWD4QM0QpTQw/fovKzatss0=
 github.com/v3io/v3io-go-http v0.0.0-20190221115935-53e2b487c9a2/go.mod h1:GXYcR9MxgfbE3BJdkXki5EclvtS8Nxu2RQNLA8hMMog=
 github.com/v3io/v3io-tsdb v0.0.0-20190328071546-4e85f3df2d205fc7368d54184bb2ceff949ab4bd/go.mod h1:A+5yKC16QxLf+Fy5v7VvIxSw+jwsKHLhUS7dCYFDLAA=
-github.com/v3io/v3io-tsdb v0.9.6 h1:N1IMo+Fk+B/afWcytseCjixhK3X674voI6b5o1VmaFY=
-github.com/v3io/v3io-tsdb v0.9.6/go.mod h1:cPLq5KvhxzdvRaVzy8HTDxousSFUaSRBRdhtd131JgU=
-github.com/v3io/v3io-tsdb v0.9.7 h1:56UtS2LsurVcNYnY0c1NUO8xtDBuuiJZU6xnBiXDrTw=
-github.com/v3io/v3io-tsdb v0.9.7/go.mod h1:cPLq5KvhxzdvRaVzy8HTDxousSFUaSRBRdhtd131JgU=
-github.com/v3io/v3io-tsdb v0.9.8 h1:74vTM4v+TPJsar3vioa4IIOwjgQ1mrPZueMk4Ze8BdQ=
-github.com/v3io/v3io-tsdb v0.9.8/go.mod h1:u+rpkZxYmy5L7EcGuReO0u44BlgGYHY2cuvZXgA159A=
 github.com/v3io/v3io-tsdb v0.9.9 h1:5mbWfwg3LBZO9h8d77aFEj9GxlfqDu662xoz0FQY26w=
 github.com/v3io/v3io-tsdb v0.9.9/go.mod h1:xWPF4NZDATVbFLfrUwlw+jbYZQzG0fpEhwG/bJiE9dI=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=