This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch cluster_premerge2
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 297ab12 Merge branch 'master' into cluster_premerge2
add c345c23 fix some error in documents (#1342)
add 3bad01d Lazy Contruct AliasMap in InternalMNode (#1343)
add 91d5222 Merge branch 'master' into cluster_premerge2
No new revisions were added by this update.
Summary of changes:
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 ++++----
docs/zh/UserGuide/System Tools/Sync Tool.md | 2 +-
.../resources/conf/iotdb-engine.properties | 4 ++--
.../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 ++--
16 files changed, 39 insertions(+), 32 deletions(-)
