Merge branch 'master' into hot_compaction
authorHaonan <hhaonan@outlook.com>
Mon, 29 Jun 2020 08:02:30 +0000 (16:02 +0800)
committerGitHub <noreply@github.com>
Mon, 29 Jun 2020 08:02:30 +0000 (16:02 +0800)
commitb01f724fd94ef06bc2f93865a6085ea4bb6e49f5
tree470dcdb1166e67203fda7f58484ee460dc959ea7
parentb44f46afb727e8e2525729d2a648d47761c7a4b7
parentab5f7ccdf656120a46f23b8c6ef85f563a1673e5
Merge branch 'master' into hot_compaction
server/src/assembly/resources/conf/iotdb-engine.properties
server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java