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

Posted to commits@iotdb.apache.org by ej...@apache.org on 2020/06/01 02:49:25 UTC

[incubator-iotdb] branch dev_new_merge updated (fba5bf4 -> 1ca30f7)

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

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


    from fba5bf4  fix bug
     add 1ca30f7  reformat merge code

No new revisions were added by this update.

Summary of changes:
 server/src/assembly/resources/conf/iotdb-engine.properties       | 9 ++++++---
 server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java   | 2 +-
 .../src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java  | 5 ++---
 .../src/main/java/org/apache/iotdb/db/engine/StorageEngine.java  | 2 +-
 .../java/org/apache/iotdb/db/integration/IoTDBDeletionIT.java    | 1 -
 5 files changed, 10 insertions(+), 9 deletions(-)