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

Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/04/13 12:03:25 UTC

[incubator-iotdb] 01/02: Merge remote-tracking branch 'origin/jmx'

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

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

commit 53e275af177f66bc04b674bc81dc42833e901de6
Merge: 164df75 d33b74c
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Mon Apr 13 20:02:07 2020 +0800

    Merge remote-tracking branch 'origin/jmx'

 server/src/assembly/resources/conf/iotdb-env.bat      | 16 ++++++++--------
 server/src/assembly/resources/conf/jmx.access         | 19 +++++++++++++++++++
 server/src/assembly/resources/conf/jmx.password       | 19 +++++++++++++++++++
 .../java/org/apache/iotdb/db/service/JMXService.java  | 17 ++---------------
 4 files changed, 48 insertions(+), 23 deletions(-)