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

Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/04/13 10:06:55 UTC

[incubator-iotdb] 01/01: Merge branch 'jmx'

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

qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit 164df758cbe8877dc6adb1933a5f57a6d3c31667
Merge: c001966 01d2e8c
Author: qiaojialin <64...@qq.com>
AuthorDate: Mon Apr 13 18:05:19 2020 +0800

    Merge branch 'jmx'

 docs/UserGuide/3-Server/4-Config Manual.md         | 47 +++++++++++++-------
 server/src/assembly/resources/conf/iotdb-env.bat   | 30 ++++++++++---
 server/src/assembly/resources/conf/iotdb-env.sh    | 30 ++++++++++---
 server/src/assembly/resources/conf/jmx.access      |  3 ++
 server/src/assembly/resources/conf/jmx.password    |  3 ++
 .../org/apache/iotdb/db/conf/IoTDBConstant.java    | 10 ++---
 .../org/apache/iotdb/db/service/JMXService.java    | 50 ++--------------------
 .../org/apache/iotdb/db/service/StartupChecks.java |  9 +---
 .../apache/iotdb/db/utils/EnvironmentUtils.java    |  1 -
 9 files changed, 92 insertions(+), 91 deletions(-)