diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2021-03-09 14:22:15 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2021-03-09 14:22:15 +0300 |
| commit | e85a6382c20424c2bc30f7fa35ab1303f9f869c3 (patch) | |
| tree | b269a808a2ba2a43086ee8eed70add773df25340 /.gitignore | |
| parent | d1f24887c791fa3a39e0e868faeb365b84773034 (diff) | |
| parent | 07f0a480c594dd3f7654028c450e354e5a4b9796 (diff) | |
.......... [ZBXNEXT-6478] merged branch 'master' of ssh://git.zabbix.lan:7999/zbx/zabbix into feature/ZBXNEXT-6478-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 50ca579eca3..c94705869c4 100644 --- a/.gitignore +++ b/.gitignore @@ -95,11 +95,11 @@ sbin/zabbix_agentd sbin/zabbix_web_service 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 |