You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by jf...@apache.org on 2021/03/26 09:17:00 UTC

[iotdb] 03/04: Merge branch 'feature/client-py-pandas' into feature/restrucutre-python-module

This is an automated email from the ASF dual-hosted git repository.

jfeinauer pushed a commit to branch feature/restrucutre-python-module
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit a2b104e623ad4cc0ebfbf9de15e4018601acf244
Merge: 5c9e579 8a7aa94
Author: Julian Feinauer <j....@pragmaticminds.de>
AuthorDate: Fri Mar 26 09:45:16 2021 +0100

    Merge branch 'feature/client-py-pandas' into feature/restrucutre-python-module
    
    # Conflicts:
    #	client-py/pypi/README.md

 client-py/iotdb/Session.py              |  1 +
 client-py/iotdb/iotdb_utils.py          | 74 +++++++++++++++++++++++++++++++++
 client-py/iotdb/utils/SessionDataSet.py |  7 ++--
 3 files changed, 79 insertions(+), 3 deletions(-)

diff --cc client-py/iotdb/iotdb_utils.py
index 0000000,bd4573e..bd4573e
mode 000000,100644..100644
--- a/client-py/iotdb/iotdb_utils.py
+++ b/client-py/iotdb/iotdb_utils.py