diff options
| author | Vladislavs Sokurenko <vladislavs.sokurenko@zabbix.com> | 2020-02-05 14:08:12 +0300 |
|---|---|---|
| committer | Vladislavs Sokurenko <vladislavs.sokurenko@zabbix.com> | 2020-02-05 14:08:12 +0300 |
| commit | 9dffbdd39e0a5bc3616d77dd9784612c5c74a4d5 (patch) | |
| tree | ad814682f51f1f8da607372f2b84ca40547fadc1 /include/zbxjson.h | |
| parent | 55c31a531ee6eb2d929c204d6c5ac215c7f3d1d8 (diff) | |
| parent | 099020ab8aa04bc4e3fa632663b161bd4bca3c35 (diff) | |
.......... [ZBXNEXT-5287,ZBXNEXT-5288] merged from master, fixed conflicts
Diffstat (limited to 'include/zbxjson.h')
| -rw-r--r-- | include/zbxjson.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/zbxjson.h b/include/zbxjson.h index 6f0c6839cf7..7612dcffe72 100644 --- a/include/zbxjson.h +++ b/include/zbxjson.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2019 Zabbix SIA +** Copyright (C) 2001-2020 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -70,7 +70,7 @@ #define ZBX_PROTO_TAG_HOST_AVAILABILITY "host availability" #define ZBX_PROTO_TAG_HISTORY_DATA "history data" #define ZBX_PROTO_TAG_DISCOVERY_DATA "discovery data" -#define ZBX_PROTO_TAG_AUTO_REGISTRATION "auto registration" +#define ZBX_PROTO_TAG_AUTOREGISTRATION "auto registration" #define ZBX_PROTO_TAG_MORE "more" #define ZBX_PROTO_TAG_ITEMID "itemid" #define ZBX_PROTO_TAG_TTL "ttl" |