This is an automated email from the ASF dual-hosted git repository.
zhengqiwei pushed a change to branch i18n_japanese_tidb
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
from ab0f46e7b8 Merge branch 'master' into i18n_japanese_tidb
add 0b0fac4a41 [bugfix] fix the collector aes decode with secret error
(#3652)
add 8f48e9d597 Merge branch 'master' into i18n_japanese_tidb
No new revisions were added by this update.
Summary of changes:
.../entrance/processor/GoOnlineProcessor.java | 13 ++++++
.../hertzbeat/common/entity/dto/ServerInfo.java | 17 ++++----
.../org/apache/hertzbeat/common/util/AesUtil.java | 12 ++++--
.../apache/hertzbeat/common/util/AesUtilTest.java | 2 +-
.../manager/config/ConfigInitializer.java | 48 ++++++++++++----------
.../manager/scheduler/CollectorJobScheduler.java | 4 ++
.../netty/process/CollectorOnlineProcessor.java | 11 ++++-
.../remoting/netty/NettyRemotingAbstract.java | 14 +++++--
8 files changed, 80 insertions(+), 41 deletions(-)
copy
hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/SystemSecret.java
=>
hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ServerInfo.java
(80%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
