diff options
author | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2020-05-06 09:24:56 +0300 |
---|---|---|
committer | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2020-05-06 09:24:56 +0300 |
commit | 918d7b0e9daa5e28f011ca2d79548e35ea2e915f (patch) | |
tree | c3c61445f8f70f63b833c2484e5f3bfba64b64a3 | |
parent | daf04923b92a876f43a8c531fa37fba3a64fb7dd (diff) |
.......... [ZBX-17667] sorted the lines in .gitignore alphabetically and removed duplicates
-rw-r--r-- | .gitignore | 150 |
1 files changed, 73 insertions, 77 deletions
diff --git a/.gitignore b/.gitignore index 7be82258514..c81f2750817 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,20 @@ -/.buildpath -/.project -/.settings -/.idea -Makefile -Makefile.in !/build/win32/**/Makefile !/build/win64/**/Makefile !/src/modules/dummy/Makefile -frontend.mo +*.a +*.o +.cproject .deps .dirstamp +.vscode +/.buildpath +/.idea +/.project +/.settings +/Debug/ +/GPATH +/GRTAGS +/GTAGS /aclocal.m4 /autom4te.cache /compile @@ -19,16 +24,21 @@ frontend.mo /config.sub /configure /cscope.* -/GPATH -/GRTAGS -/GTAGS /depcomp +/install-sh /missing /nbproject -/install-sh /tags -*.a -*.o +/zabbix-*.tar.gz +Makefile +Makefile.in +bin/agent +bin/mock_server +bin/win32 +bin/win64 +bin/zabbix_get +bin/zabbix_js +bin/zabbix_sender build/win32/examples/zabbix_sender/sender.exe build/win32/examples/zabbix_sender/sender.obj build/win32/project/*.idb @@ -48,20 +58,12 @@ database/postgresql/schema.sql database/postgresql/timescaledb.sql database/sqlite3/data.sql database/sqlite3/schema.sql -ui/.buildpath -ui/.htpasswd -ui/.idea -ui/.project -ui/conf/zabbix.conf.php -ui/images/general/*.db -ui/images/general/tree/*.db -ui/js/jsDump.js -ui/local/conf/brand.conf.php -ui/locale/POTFILES.in -ui/locale/frontend.pot -ui/tests/bootstrap.php -ui/tests/vendor -ui/tests/composer.* +etc/agent.conf +etc/zabbix_agent2.conf +etc/zabbix_agentd.conf +etc/zabbix_proxy.conf +etc/zabbix_server.conf +frontend.mo include/config.h include/config.h.in include/stamp-h1 @@ -87,6 +89,25 @@ sass/stylesheets/sass/index.md sass/stylesheets/sass/screen2.scss sass/stylesheets/themes sass/wide-table.html +sbin/zabbix_agent2 +sbin/zabbix_agentd +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-console.xml +sbin/zabbix_java/lib/logback-core-0.9.27.jar +sbin/zabbix_java/lib/logback.xml +sbin/zabbix_java/lib/slf4j-api-1.6.1.jar +sbin/zabbix_java/settings.sh +sbin/zabbix_java/shutdown.sh +sbin/zabbix_java/startup.sh +sbin/zabbix_proxy +sbin/zabbix_server +share/man/man1/zabbix_get.1 +share/man/man1/zabbix_sender.1 +share/man/man8/zabbix_agentd.8 +share/man/man8/zabbix_proxy.8 +share/man/man8/zabbix_server.8 src/libs/zbxcunit/cu_modules.h src/libs/zbxdbhigh/dbschema.c src/zabbix_agent/zabbix_agent @@ -103,10 +124,12 @@ tests/libs/zbxalgo/evaluate_unknown tests/libs/zbxalgo/queue tests/libs/zbxcommon/calculate_item_nextcheck tests/libs/zbxcommon/calculate_item_nextcheck_unreachable +tests/libs/zbxcommon/convert_to_utf8 tests/libs/zbxcommon/is_double tests/libs/zbxcommon/is_double_suffix tests/libs/zbxcommon/parse_key tests/libs/zbxcommon/replace_key_params_dyn +tests/libs/zbxcommon/zbx_dyn_escape_string tests/libs/zbxcommon/zbx_function_find tests/libs/zbxcommon/zbx_function_get_param_dyn tests/libs/zbxcommon/zbx_interval_preproc @@ -114,11 +137,11 @@ tests/libs/zbxcommon/zbx_str_extract tests/libs/zbxcommon/zbx_token_find tests/libs/zbxcommon/zbx_trim_float tests/libs/zbxcommon/zbx_trim_integer +tests/libs/zbxcommon/zbx_truncate_itemkey +tests/libs/zbxcommon/zbx_truncate_value +tests/libs/zbxcommon/zbx_user_macro_parse tests/libs/zbxcommon/zbx_validate_interval tests/libs/zbxcommon/zbx_variant_compare -tests/libs/zbxcommon/zbx_user_macro_parse -tests/libs/zbxcommon/convert_to_utf8 -tests/libs/zbxcommon/zbx_dyn_escape_string tests/libs/zbxcomms/zbx_tcp_check_allowed_peers tests/libs/zbxcomms/zbx_tcp_check_allowed_peers_ipv4 tests/libs/zbxcommshigh/zbx_tcp_recv_ext @@ -129,16 +152,16 @@ tests/libs/zbxdbcache/dc_check_maintenance_period tests/libs/zbxdbcache/dc_item_poller_type_update tests/libs/zbxdbcache/dc_maintenance_match_tags tests/libs/zbxdbcache/is_item_processed_by_server +tests/libs/zbxdbcache/zbx_dc_expand_user_macros_in_expression tests/libs/zbxdbcache/zbx_vc_add_values tests/libs/zbxdbcache/zbx_vc_get_value tests/libs/zbxdbcache/zbx_vc_get_values -tests/libs/zbxdbcache/zbx_dc_expand_user_macros_in_expression tests/libs/zbxdbhigh/DBadd_condition_alloc tests/libs/zbxdbhigh/DBselect_uint64 tests/libs/zbxhistory/zbx_history_get_values -tests/libs/zbxjson/zbx_json_open_path tests/libs/zbxjson/zbx_json_decodevalue tests/libs/zbxjson/zbx_json_decodevalue_dyn +tests/libs/zbxjson/zbx_json_open_path tests/libs/zbxjson/zbx_jsonpath_compile tests/libs/zbxjson/zbx_jsonpath_query tests/libs/zbxprometheus/prometheus_filter_init @@ -146,6 +169,10 @@ tests/libs/zbxprometheus/prometheus_parse_row tests/libs/zbxprometheus/zbx_prometheus_pattern tests/libs/zbxprometheus/zbx_prometheus_to_json tests/libs/zbxregexp/wildcard_match +tests/libs/zbxserver/evaluate_function +tests/libs/zbxserver/get_trigger_expression_constant +tests/libs/zbxserver/substitute_lld_macros +tests/libs/zbxsysinfo/check_key_access_rules tests/libs/zbxsysinfo/common/SYSTEM_LOCALTIME tests/libs/zbxsysinfo/common/VFS_FILE_EXISTS tests/libs/zbxsysinfo/common/WEB_PAGE_GET @@ -160,54 +187,23 @@ tests/libs/zbxsysinfo/linux/SYSTEM_CPU_INTR tests/libs/zbxsysinfo/linux/SYSTEM_CPU_SWITCHES tests/libs/zbxsysinfo/linux/SYSTEM_HW_CHASSIS tests/libs/zbxsysinfo/linux/VFS_FS_DISCOVERY -tests/libs/zbxsysinfo/linux/SYSTEM_HW_CHASSIS tests/libs/zbxsysinfo/parse_item_key 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 -tests/libs/zbxcommon/zbx_truncate_itemkey -tests/libs/zbxcommon/zbx_truncate_value -tests/libs/zbxserver/evaluate_function -tests/libs/zbxserver/get_trigger_expression_constant -tests/libs/zbxserver/substitute_lld_macros -/zabbix-*.tar.gz -.vscode -sbin/zabbix_agentd -sbin/zabbix_proxy -sbin/zabbix_server -sbin/zabbix_java/lib/logback.xml -sbin/zabbix_java/settings.sh -sbin/zabbix_java/shutdown.sh -sbin/zabbix_java/startup.sh -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-console.xml -sbin/zabbix_java/lib/logback-core-0.9.27.jar -sbin/zabbix_java/lib/slf4j-api-1.6.1.jar -share/man/man1/zabbix_get.1 -share/man/man1/zabbix_sender.1 -share/man/man8/zabbix_agentd.8 -share/man/man8/zabbix_proxy.8 -share/man/man8/zabbix_server.8 -etc/zabbix_agentd.conf -etc/zabbix_proxy.conf -etc/zabbix_server.conf -bin/agent -bin/mock_server -bin/zabbix_get -bin/zabbix_sender -bin/zabbix_js -.cproject -etc/agent.conf -sbin/zabbix_agent2 -etc/zabbix_agent2.conf -bin/win32 -bin/win64 -/Debug/ +ui/.buildpath +ui/.htpasswd +ui/.idea +ui/.project +ui/conf/zabbix.conf.php +ui/images/general/*.db +ui/images/general/tree/*.db +ui/js/jsDump.js +ui/local/conf/brand.conf.php +ui/locale/POTFILES.in +ui/locale/frontend.pot +ui/tests/bootstrap.php +ui/tests/composer.* +ui/tests/vendor |