diff options
author | Andris Zeila <andris.zeila@zabbix.com> | 2021-03-12 13:02:40 +0300 |
---|---|---|
committer | Andris Zeila <andris.zeila@zabbix.com> | 2021-03-12 13:02:40 +0300 |
commit | 65a6c53b003bef831288145a59dd75c07dbf0dbd (patch) | |
tree | 97e2375ec574c25d2070dac74b3a22f15a56254e /.gitignore | |
parent | 5ef309d8a24243f6f03fc64f63d61aa5ef6e4661 (diff) | |
parent | 671768fb49c5198a6cf174c41f0243d4574610fc (diff) |
.......... [ZBXNEXT-6451] merged branch 'master' of ssh://git.zabbix.lan:7999/zbx/zabbix into feature/ZBXNEXT-6451-5.3
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index caa9da04d80..3e6be4f67c3 100644 --- a/.gitignore +++ b/.gitignore @@ -93,11 +93,11 @@ sbin/zabbix_agent2 sbin/zabbix_agentd sbin/zabbix_java/bin/zabbix-java-gateway-4.4.0alpha1.jar sbin/zabbix_java/lib/android-json-4.3_r3.1.jar -sbin/zabbix_java/lib/logback-classic-0.9.27.jar +sbin/zabbix_java/lib/logback-classic-1.2.3.jar sbin/zabbix_java/lib/logback-console.xml -sbin/zabbix_java/lib/logback-core-0.9.27.jar +sbin/zabbix_java/lib/logback-core-1.2.3.jar sbin/zabbix_java/lib/logback.xml -sbin/zabbix_java/lib/slf4j-api-1.6.1.jar +sbin/zabbix_java/lib/slf4j-api-1.7.30.jar sbin/zabbix_java/settings.sh sbin/zabbix_java/shutdown.sh sbin/zabbix_java/startup.sh |