This is an automated email from the ASF dual-hosted git repository. shuwenwei pushed a change to branch addSomeCommonInterfacesForCompatibility-0929 in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 33811b04530 fix conflict
add 5a30c34088b fix conflict
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/iotdb/confignode/manager/PermissionManager.java | 5 +++++
1 file changed, 5 insertions(+)
