[incubator-iotdb] branch new_series_reader updated (1509a8b -> 4c0390f)

[hx...@apache.org]

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

hxd pushed a change to branch new_series_reader
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from 1509a8b  Merge branch 'new_series_reader' of https://github.com/apache/incubator-iotdb into new_series_reader
     add a057780  do not print "cant get cpu ratio" in Tests
     add a421890  fix bug in ActiveTimeSeriesCounter Test
     add 42fd2b7  wait at most 30s for finishing merge tasks before stop daemon.
     add 4c0390f  Merge branch 'new_series_reader' of github.com:apache/incubator-iotdb into new_series_reader

No new revisions were added by this update.

Summary of changes:
 .../iotdb/db/engine/merge/manage/MergeManager.java | 29 ++++++++++++++++++++++
 .../db/engine/merge/manage/MergeResource.java      |  2 +-
 .../db/engine/merge/task/MergeMultiChunkTask.java  |  1 +
 .../java/org/apache/iotdb/db/service/IService.java |  2 ++
 .../org/apache/iotdb/db/service/JMXService.java    |  8 ------
 .../apache/iotdb/db/service/RegisterManager.java   |  2 +-
 .../engine/storagegroup/TsFileProcessorTest.java   |  4 ++-
 .../apache/iotdb/db/utils/EnvironmentUtils.java    |  4 ++-
 .../db/writelog/recover/SeqTsFileRecoverTest.java  |  4 +--
 .../writelog/recover/UnseqTsFileRecoverTest.java   |  2 +-
 server/src/test/resources/logback.xml              |  2 ++
 11 files changed, 45 insertions(+), 15 deletions(-)