This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch cluster_premerge
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from f084eb8 Merge branch 'master' into cluster_premerge
add 25ad18b fix baseDir
No new revisions were added by this update.
Summary of changes:
.../iotdb/cross/tests/utils/EnvironmentUtils.java | 4 +--
.../resources/conf/iotdb-engine.properties | 9 +++---
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 35 ++++++++--------------
.../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 2 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 9 ++----
.../db/conf/directories/DirectoryManager.java | 2 +-
.../apache/iotdb/db/monitor/MonitorConstants.java | 2 +-
.../java/org/apache/iotdb/db/service/Monitor.java | 4 +--
.../org/apache/iotdb/db/service/MonitorMBean.java | 2 +-
.../iotdb/db/tools/memestimation/MemEstTool.java | 8 ++++-
.../org/apache/iotdb/db/utils/OpenFileNumUtil.java | 2 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 5 ++--
.../apache/iotdb/db/writelog/WriteLogNodeTest.java | 7 ++---
.../apache/iotdb/spark/db/EnvironmentUtils.java | 5 ++--
14 files changed, 43 insertions(+), 53 deletions(-)
