This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch acc_cache in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 776600066a8cb2cf79cf9c61916ee02daef89473 Merge: 90c5a4d 8f87fd3 Author: qiaojialin <[email protected]> AuthorDate: Thu Jun 11 16:28:50 2020 +0800 Merge remote-tracking branch 'origin/master' README.md | 2 +- README_ZH.md | 2 +- docs/Development/VoteRelease.md | 2 +- .../Ecosystem Integration/Spark TsFile.md | 2 +- docs/UserGuide/Server/Docker Image.md | 8 ++++---- docs/zh/Development/VoteRelease.md | 2 +- docs/zh/UserGuide/Client/Programming - JDBC.md | 2 +- .../Ecosystem Integration/Spark TsFile.md | 2 +- docs/zh/UserGuide/Server/Docker Image.md | 8 ++++---- .../iotdb/db/metadata/mnode/InternalMNode.java | 23 +++++++++++++--------- .../db/qp/physical/crud/AlignByDevicePlan.java | 2 ++ .../iotdb/db/qp/strategy/PhysicalGenerator.java | 2 +- service-rpc/rpc-changelist.md | 4 ++-- tsfile/format-changelist.md | 4 ++-- .../apache/iotdb/tsfile/utils/VersionUtils.java | 5 +++++ 15 files changed, 41 insertions(+), 29 deletions(-)
