diff options
| author | Michael Veksler <Mihails.Vekslers@zabbix.com> | 2018-05-21 09:16:52 +0300 |
|---|---|---|
| committer | Michael Veksler <Mihails.Vekslers@zabbix.com> | 2018-05-21 09:16:52 +0300 |
| commit | 4f9288ba232e2c3c4afcd95f61a947ea5ace42fb (patch) | |
| tree | f54f7eff5c88ecacedc8bb3794c8e70bd4214e31 /.gitattributes | |
| parent | 4072c16e4f80171827d28638f38dd74f390f958c (diff) | |
| parent | 15c54825290717999b560695d519a37b2ee31166 (diff) | |
.......... [ZBX-13778] updated to the latest trunk
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index a083259f5b3..8f9f4801973 100644 --- a/.gitattributes +++ b/.gitattributes @@ -351,6 +351,10 @@ 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_value.yaml -text +tests/libs/zbxdbcache/zbx_vc_get_values.yaml -text +tests/libs/zbxhistory/zbx_history_get_values.yaml -text upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Hub.png -text svneol=unset#image/png upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Hub_small.png -text svneol=unset#image/png upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Network.png -text svneol=unset#image/png |