You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/08/12 02:42:34 UTC

[incubator-iotdb] branch dev_merge updated (09a1bf5 -> 187a9ff)

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

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


    from 09a1bf5  Merge branch 'master' into dev_merge
     add 187a9ff  fix config: MergeThreadNum

No new revisions were added by this update.

Summary of changes:
 .../main/java/org/apache/iotdb/db/conf/IoTDBConfig.java    | 14 --------------
 .../apache/iotdb/db/engine/merge/manage/MergeManager.java  |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)