This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch cluster_premerge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 54f3de4 Merge branch 'master' into cluster_premerge
add 3fa3907 add comments
add 9aa51cc Merge branch 'cluster_premerge' of
github.com:apache/incubator-iotdb into cluster_premerge
No new revisions were added by this update.
Summary of changes:
.../engine/storagegroup/StorageGroupProcessor.java | 24 +++++++++++++++-------
.../db/engine/storagegroup/TsFileResource.java | 1 +
.../org/apache/iotdb/db/metadata/MManager.java | 15 +++++++++++++-
.../db/query/dataset/ShowTimeSeriesResult.java | 8 ++++----
4 files changed, 36 insertions(+), 12 deletions(-)