You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/07/26 13:05:56 UTC

[incubator-iotdb] branch dev_merge updated (a17a737 -> f9e18ca)

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

jiangtian pushed a change to branch dev_merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from a17a737  clean imports
     add a6603c6  [IOTDB-152]return data type in TSExecuteStatementResp (#294)
     add 4ac6d7e  [IOTDB-153]further limit fetchSize to speed up LIMIT&OFFSET query (#302)
     add 8129f8c  remove unuseful package.sh and fix a url in pom.xml.
     add e2e0251  Add maven package
     add e2e5a84  Merge pull request #304 from Genius-pig/master
     add c56fc48  Split the LICENSE and NOTICE as source-release version and binary-release version (#300)
     add 7557d3e  update version to 0.9.0-SNAPSHOT
     add 1ef5bfe  Merge pull request #309 from apache/cherry_pick_rel0.8
     add f9e18ca  Merge branch 'master' into dev_merge

No new revisions were added by this update.

Summary of changes:
 DISCLAIMER                                         |   6 +
 License => LICENSE                                 |  84 +---
 License => LICENSE-binary                          |  34 +-
 NOTICE                                             | 500 +--------------------
 NOTICE-binary                                      |  94 ++++
 build/pom.xml                                      |   9 +-
 build/src/main/resources/distribution.xml          |   7 +-
 client/pom.xml                                     |   2 +-
 codecov.yml                                        |   1 +
 .../UserGuide/7-TsFile/1-Installation.md           |   4 +-
 example/kafka/pom.xml                              |   2 +-
 example/kafka/readme.md                            |   4 +-
 example/pom.xml                                    |   2 +-
 grafana/pom.xml                                    |   4 +-
 hadoop/pom.xml                                     |   4 +-
 jdbc/package.sh                                    |  43 --
 jdbc/pom.xml                                       |   6 +-
 .../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java |  14 +-
 .../java/org/apache/iotdb/jdbc/IoTDBStatement.java |  31 +-
 .../apache/iotdb/jdbc/IoTDBQueryResultSetTest.java |  11 +-
 pom.xml                                            |   6 +-
 server/pom.xml                                     |   2 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  20 +-
 service-rpc/pom.xml                                |   2 +-
 service-rpc/src/main/thrift/rpc.thrift             |   2 +
 spark-tsfile/pom.xml                               |   2 +-
 tsfile/package.sh                                  |  43 --
 tsfile/pom.xml                                     |   2 +-
 28 files changed, 195 insertions(+), 746 deletions(-)
 create mode 100644 DISCLAIMER
 copy License => LICENSE (83%)
 rename License => LICENSE-binary (93%)
 create mode 100644 NOTICE-binary
 delete mode 100755 jdbc/package.sh
 delete mode 100755 tsfile/package.sh