This is an automated email from the ASF dual-hosted git repository. ejttianyu pushed a commit to branch win_e_option in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit f67d7758ba97145f1d24853f78ae2528f697f298 Merge: 47d3315 9a4b83c Author: EJTTianyu <[email protected]> AuthorDate: Wed Feb 12 20:17:48 2020 +0800 Merge branch 'master' of https://github.com/apache/incubator-iotdb into origin_master .asf.yaml | 30 +++ .../SystemDesign/6-Tools/1-Sync.md | 278 ++++++++++++++++++++- .../2-DML (Data Manipulation Language).md | 4 +- pom.xml | 2 +- .../db/query/dataset/DeviceIterateDataSet.java | 15 +- .../SeriesReaderWithoutValueFilter.java | 15 +- .../iotdb/db/sync/sender/transfer/SyncClient.java | 9 +- .../iotdb/db/integration/IoTDBDisableAlignIT.java | 7 +- .../iotdb/db/integration/IoTDBQueryDemoIT.java | 14 +- .../iotdb/db/integration/IoTDBRecoverIT.java | 14 +- .../apache/iotdb/db/utils/EnvironmentUtils.java | 12 + 11 files changed, 357 insertions(+), 43 deletions(-)
