This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch hot_compaction
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 524c9fe resolve conflict
add c493621 add properties
No new revisions were added by this update.
Summary of changes:
.../resources/conf/iotdb-engine.properties | 6 ++++++
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 25 ++++++++++++++++++++++
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 8 +++++++
.../db/engine/storagegroup/TsFileProcessor.java | 6 +++++-
4 files changed, 44 insertions(+), 1 deletion(-)