diff options
author | Andris Zeila <andris.zeila@zabbix.com> | 2018-04-27 15:05:49 +0300 |
---|---|---|
committer | Andris Zeila <andris.zeila@zabbix.com> | 2018-04-27 15:05:49 +0300 |
commit | 348b45117b41972369f6c4d10259ffcc15c01a93 (patch) | |
tree | 3a81003c8c464c9ce99768dfd6851c301c42782e /.gitattributes | |
parent | 78f557638f8f1a568ca99fbcf59eb8ea6c961ce7 (diff) | |
parent | 5b87fd946b29453ac85357c7009f9a7cff8b531f (diff) |
.......... [ZBX-12390] merged from upstream
Diffstat (limited to '.gitattributes')
-rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 16cceff87bf..f5dc51b15b8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -351,6 +351,7 @@ src/zabbix_server/taskmanager/Makefile.am -text src/zabbix_server/taskmanager/proxy_tasks.c -text src/zabbix_server/taskmanager/taskmanager.c -text src/zabbix_server/taskmanager/taskmanager.h -text +tests/libs/zbxcommon/replace_key_params_dyn.yaml -text tests/libs/zbxdbcache/zbx_vc_add_values.yaml -text tests/libs/zbxdbcache/zbx_vc_get_values.yaml -text tests/libs/zbxhistory/zbx_history_get_values.yaml -text |