diff options
| author | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2020-03-26 11:58:32 +0300 |
|---|---|---|
| committer | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2020-03-26 11:58:32 +0300 |
| commit | b9050ebb556cb82d4c354e7382e6bc6dafbcd5c0 (patch) | |
| tree | 35ef2153aabbcc927e6ab9f8644ae4d677f94f82 /.gitignore | |
| parent | 72ce77333e82652c146fbdfe9aa44665cc54afad (diff) | |
| parent | 5f73a8536a9c639ef1b30f6cca1eef0f968328ce (diff) | |
........S. [ZBXNEXT-1961] merge with master, fixed conflict in dbsync.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 98cb13265f4..81f38ffae00 100644 --- a/.gitignore +++ b/.gitignore @@ -165,6 +165,8 @@ tests/libs/zbxsysinfo/process tests/libs/zbxsysinfo/check_key_access_rules tests/libs/zbxdbcache/is_item_processed_by_server tests/zabbix_server/preprocessor/item_preproc_csv_to_json +tests/libs/zbxcommon/convert_to_utf8 +tests/libs/zbxdbhigh/DBadd_condition_alloc tests/zabbix_server/preprocessor/item_preproc_xpath tests/zabbix_server/preprocessor/zbx_item_preproc tests/zabbix_server/trapper/zbx_trapper_preproc_test_run |