You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/11/05 13:55:09 UTC

[iotdb] 01/01: Merge commit '29f546e' into rel/0.11

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

hxd pushed a commit to branch rel/0.11
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 66ce853939d640b4ec6c1059b004834912ca2c94
Merge: 9bd4187 29f546e
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Thu Nov 5 21:53:11 2020 +0800

    Merge commit '29f546e' into rel/0.11

 RELEASE_NOTES.md                                   |  2 +-
 server/file-changelists/conf-changelist.md         | 95 ++++++++++++++++++++++
 server/file-changelists/mlog-changelist.md         |  6 ++
 .../system.properties-changelist.md                |  8 ++
 server/src/assembly/resources/sbin/stop-server.sh  | 10 ++-
 .../org/apache/iotdb/db/metadata/MManager.java     |  1 -
 .../java/org/apache/iotdb/db/metadata/MTree.java   |  2 +-
 7 files changed, 118 insertions(+), 6 deletions(-)