Merge branch 'ubuntu' of https://github.com/atlesn/rrr into ubuntu
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch ubuntu
# Your branch and 'origin/ubuntu' have diverged,
# and have 2 and 230 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	modified:   .gitignore
#	new file:   .ycm_extra_conf.py
#	modified:   README.dev.md
#	modified:   archlinux/.SRCINFO
#	modified:   archlinux/PKGBUILD
#	new file:   check.pl
#	modified:   configure.ac
#	modified:   debian/changelog
#	modified:   debian/rrr.install
#	modified:   examples/http/http_push_mqtt.conf
#	modified:   m4/shell_variables.m4
#	modified:   merge_all_from_master.sh
#	modified:   misc/man/rrr.conf.5
#	new file:   misc/test_configs/rrr_cacher.conf
#	new file:   misc/test_configs/rrr_http.conf
#	modified:   misc/test_configs/rrr_http2.conf
#	modified:   misc/test_configs/rrr_http2.pl
#	modified:   misc/test_configs/rrr_http2_client.pl
#	new file:   misc/test_configs/rrr_http2_nagging.conf
#	modified:   misc/test_configs/rrr_incrementer.conf
#	modified:   misc/test_configs/rrr_test.conf
#	modified:   misc/test_configs/rrr_test_ipclient.conf
#	modified:   misc/test_configs/rrr_test_mqtt.conf
#	modified:   rpm/rrr.spec
#	modified:   rpm/version
#	modified:   src/lib/Makefile.am
#	modified:   src/lib/allocator.c
#	modified:   src/lib/allocator.h
#	modified:   src/lib/array.c
#	modified:   src/lib/array.h
#	modified:   src/lib/array_tree.c
#	modified:   src/lib/array_tree.h
#	deleted:    src/lib/buffer.c
#	deleted:    src/lib/buffer.h
#	modified:   src/lib/cmdlineparser/cmdline.c
#	modified:   src/lib/cmdlineparser/cmdline.h
#	modified:   src/lib/cmodule/cmodule_channel.c
#	modified:   src/lib/cmodule/cmodule_channel.h
#	modified:   src/lib/cmodule/cmodule_defines.h
#	modified:   src/lib/cmodule/cmodule_helper.c
#	modified:   src/lib/cmodule/cmodule_helper.h
#	modified:   src/lib/cmodule/cmodule_main.c
#	modified:   src/lib/cmodule/cmodule_main.h
#	modified:   src/lib/cmodule/cmodule_struct.h
#	modified:   src/lib/cmodule/cmodule_worker.c
#	modified:   src/lib/cmodule/cmodule_worker.h
#	modified:   src/lib/condition.c
#	modified:   src/lib/condition.h
#	modified:   src/lib/configuration.c
#	modified:   src/lib/configuration.h
#	modified:   src/lib/environment_file.c
#	modified:   src/lib/event/event.c
#	modified:   src/lib/event/event.h
#	modified:   src/lib/event/event_collection.c
#	modified:   src/lib/event/event_collection.h
#	modified:   src/lib/event/event_struct.h
#	new file:   src/lib/fifo.c
#	new file:   src/lib/fifo.h
#	new file:   src/lib/fifo_common.h
#	new file:   src/lib/fifo_protected.c
#	new file:   src/lib/fifo_protected.h
#	modified:   src/lib/fixed_point.c
#	modified:   src/lib/fixed_point.h
#	modified:   src/lib/fork.c
#	modified:   src/lib/helpers/nullsafe_str.c
#	modified:   src/lib/helpers/nullsafe_str.h
#	modified:   src/lib/http/http_application.c
#	modified:   src/lib/http/http_application.h
#	modified:   src/lib/http/http_application_http1.c
#	modified:   src/lib/http/http_application_http2.c
#	modified:   src/lib/http/http_application_http2.h
#	modified:   src/lib/http/http_application_internals.h
#	modified:   src/lib/http/http_client.c
#	modified:   src/lib/http/http_client.h
#	modified:   src/lib/http/http_client_config.c
#	modified:   src/lib/http/http_client_config.h
#	modified:   src/lib/http/http_common.h
#	modified:   src/lib/http/http_fields.c
#	modified:   src/lib/http/http_header_fields.c
#	modified:   src/lib/http/http_header_fields.h
#	modified:   src/lib/http/http_part.c
#	modified:   src/lib/http/http_part.h
#	modified:   src/lib/http/http_part_multipart.c
#	modified:   src/lib/http/http_part_parse.c
#	modified:   src/lib/http/http_part_parse.h
#	modified:   src/lib/http/http_query_builder.c
#	modified:   src/lib/http/http_query_builder.h
#	modified:   src/lib/http/http_server.c
#	modified:   src/lib/http/http_server.h
#	modified:   src/lib/http/http_session.c
#	modified:   src/lib/http/http_session.h
#	modified:   src/lib/http/http_transaction.c
#	modified:   src/lib/http/http_transaction.h
#	modified:   src/lib/http/http_util.c
#	modified:   src/lib/http/http_util.h
#	modified:   src/lib/http2/http2.c
#	modified:   src/lib/http2/http2.h
#	modified:   src/lib/input/input.c
#	modified:   src/lib/input/linux.c
#	modified:   src/lib/instance_config.c
#	modified:   src/lib/instance_config.h
#	modified:   src/lib/instances.c
#	modified:   src/lib/instances.h
#	modified:   src/lib/intercept.h
#	modified:   src/lib/ip/ip.c
#	modified:   src/lib/ip/ip.h
#	modified:   src/lib/ip/ip_util.c
#	modified:   src/lib/ip/ip_util.h
#	modified:   src/lib/json/json.c
#	modified:   src/lib/json/json.h
#	modified:   src/lib/log.c
#	modified:   src/lib/log.h
#	modified:   src/lib/map.c
#	modified:   src/lib/map.h
#	modified:   src/lib/message_broker.c
#	modified:   src/lib/message_broker.h
#	modified:   src/lib/message_holder/message_holder.c
#	modified:   src/lib/message_holder/message_holder.h
#	modified:   src/lib/message_holder/message_holder_slot.c
#	modified:   src/lib/message_holder/message_holder_slot.h
#	modified:   src/lib/message_holder/message_holder_struct.h
#	modified:   src/lib/message_holder/message_holder_util.c
#	modified:   src/lib/message_holder/message_holder_util.h
#	modified:   src/lib/messages/msg.c
#	modified:   src/lib/messages/msg.h
#	modified:   src/lib/messages/msg_addr.c
#	modified:   src/lib/messages/msg_addr.h
#	modified:   src/lib/messages/msg_checksum.c
#	modified:   src/lib/messages/msg_head.h
#	modified:   src/lib/messages/msg_log.c
#	modified:   src/lib/messages/msg_msg.c
#	modified:   src/lib/messages/msg_msg.h
#	modified:   src/lib/messages/msg_msg_struct.h
#	modified:   src/lib/mmap_channel.c
#	modified:   src/lib/mmap_channel.h
#	modified:   src/lib/mqtt/mqtt_acl.c
#	modified:   src/lib/mqtt/mqtt_assemble.c
#	modified:   src/lib/mqtt/mqtt_assemble.h
#	modified:   src/lib/mqtt/mqtt_broker.c
#	modified:   src/lib/mqtt/mqtt_broker.h
#	modified:   src/lib/mqtt/mqtt_client.c
#	modified:   src/lib/mqtt/mqtt_common.c
#	modified:   src/lib/mqtt/mqtt_common.h
#	modified:   src/lib/mqtt/mqtt_connection.c
#	modified:   src/lib/mqtt/mqtt_connection.h
#	modified:   src/lib/mqtt/mqtt_id_pool.c
#	modified:   src/lib/mqtt/mqtt_id_pool.h
#	modified:   src/lib/mqtt/mqtt_packet.c
#	modified:   src/lib/mqtt/mqtt_packet.h
#	modified:   src/lib/mqtt/mqtt_parse.c
#	modified:   src/lib/mqtt/mqtt_parse.h
#	modified:   src/lib/mqtt/mqtt_payload_buf.c
#	modified:   src/lib/mqtt/mqtt_payload_buf.h
#	modified:   src/lib/mqtt/mqtt_property.c
#	modified:   src/lib/mqtt/mqtt_property.h
#	modified:   src/lib/mqtt/mqtt_session.c
#	modified:   src/lib/mqtt/mqtt_session.h
#	modified:   src/lib/mqtt/mqtt_session_ram.c
#	modified:   src/lib/mqtt/mqtt_subscription.c
#	modified:   src/lib/mqtt/mqtt_subscription.h
#	modified:   src/lib/mqtt/mqtt_topic.c
#	modified:   src/lib/mqtt/mqtt_transport.c
#	modified:   src/lib/mqtt/mqtt_transport.h
#	modified:   src/lib/msgdb/msgdb_client.c
#	modified:   src/lib/msgdb/msgdb_client.h
#	modified:   src/lib/msgdb/msgdb_common.c
#	modified:   src/lib/msgdb/msgdb_common.h
#	modified:   src/lib/msgdb/msgdb_server.c
#	modified:   src/lib/net_transport/net_transport.c
#	modified:   src/lib/net_transport/net_transport.h
#	new file:   src/lib/net_transport/net_transport_ctx.c
#	new file:   src/lib/net_transport/net_transport_ctx.h
#	modified:   src/lib/net_transport/net_transport_libressl.c
#	modified:   src/lib/net_transport/net_transport_openssl.c
#	modified:   src/lib/net_transport/net_transport_plain.c
#	modified:   src/lib/net_transport/net_transport_struct.h
#	modified:   src/lib/net_transport/net_transport_tls_common.c
#	new file:   src/lib/net_transport/net_transport_types.h
#	modified:   src/lib/parse.c
#	modified:   src/lib/parse.h
#	modified:   src/lib/passwd.c
#	modified:   src/lib/passwd.h
#	modified:   src/lib/perl5/perl5_xsub.c
#	modified:   src/lib/perl5/perl5_xsub.h
#	modified:   src/lib/poll_helper.c
#	modified:   src/lib/poll_helper.h
#	modified:   src/lib/python3/python3_array.c
#	modified:   src/lib/python3/python3_array.h
#	modified:   src/lib/python3/python3_cmodule.c
#	modified:   src/lib/python3/python3_common.c
#	modified:   src/lib/python3/python3_config.c
#	modified:   src/lib/python3/python3_message.c
#	modified:   src/lib/python3/python3_socket.c
#	modified:   src/lib/random.c
#	modified:   src/lib/random.h
#	modified:   src/lib/read.c
#	modified:   src/lib/read.h
#	modified:   src/lib/read_constants.h
#	modified:   src/lib/rrr_mmap.c
#	modified:   src/lib/rrr_mmap.h
#	new file:   src/lib/rrr_shm.c
#	new file:   src/lib/rrr_shm.h
#	new file:   src/lib/rrr_shm_struct.h
#	modified:   src/lib/rrr_types.h
#	modified:   src/lib/serial/serial.c
#	modified:   src/lib/serial/serial.h
#	modified:   src/lib/settings.c
#	modified:   src/lib/settings.h
#	modified:   src/lib/sha1/sha1.c
#	modified:   src/lib/socket/rrr_socket.c
#	modified:   src/lib/socket/rrr_socket.h
#	modified:   src/lib/socket/rrr_socket_client.c
#	modified:   src/lib/socket/rrr_socket_client.h
#	modified:   src/lib/socket/rrr_socket_common.c
#	modified:   src/lib/socket/rrr_socket_common.h
#	modified:   src/lib/socket/rrr_socket_eventfd.c
#	modified:   src/lib/socket/rrr_socket_eventfd.h
#	modified:   src/lib/socket/rrr_socket_graylist.c
#	modified:   src/lib/socket/rrr_socket_read.c
#	modified:   src/lib/socket/rrr_socket_read.h
#	modified:   src/lib/socket/rrr_socket_send_chunk.c
#	modified:   src/lib/socket/rrr_socket_send_chunk.h
#	modified:   src/lib/stats/stats_engine.c
#	modified:   src/lib/stats/stats_engine.h
#	modified:   src/lib/stats/stats_instance.c
#	modified:   src/lib/stats/stats_instance.h
#	modified:   src/lib/stats/stats_message.c
#	modified:   src/lib/stats/stats_message.h
#	modified:   src/lib/stats/stats_tree.c
#	modified:   src/lib/string_builder.c
#	modified:   src/lib/string_builder.h
#	modified:   src/lib/threads.c
#	modified:   src/lib/threads.h
#	modified:   src/lib/type.c
#	modified:   src/lib/type.h
#	modified:   src/lib/type_conversion.c
#	modified:   src/lib/udpstream/udpstream.c
#	modified:   src/lib/udpstream/udpstream.h
#	modified:   src/lib/udpstream/udpstream_asd.c
#	modified:   src/lib/udpstream/udpstream_asd.h
#	modified:   src/lib/util/base64.c
#	modified:   src/lib/util/base64.h
#	modified:   src/lib/util/crc32.c
#	modified:   src/lib/util/gnu.c
#	modified:   src/lib/util/increment.c
#	modified:   src/lib/util/posix.c
#	modified:   src/lib/util/posix.h
#	modified:   src/lib/util/readfile.c
#	modified:   src/lib/util/rrr_readdir.c
#	modified:   src/lib/util/rrr_time.c
#	new file:   src/lib/util/sha256.c
#	new file:   src/lib/util/sha256.h
#	modified:   src/lib/util/utf8.c
#	modified:   src/lib/util/utf8.h
#	modified:   src/lib/websocket/websocket.c
#	modified:   src/lib/websocket/websocket.h
#	modified:   src/main.c
#	modified:   src/main.h
#	modified:   src/modules/Makefile.am
#	modified:   src/modules/d_mqttbroker.c
#	modified:   src/modules/d_msgdb.c
#	modified:   src/modules/d_raw.c
#	modified:   src/modules/p_averager.c
#	modified:   src/modules/p_buffer.c
#	new file:   src/modules/p_cacher.c
#	modified:   src/modules/p_cmodule.c
#	modified:   src/modules/p_exploder.c
#	modified:   src/modules/p_httpclient.c
#	modified:   src/modules/p_httpserver.c
#	modified:   src/modules/p_incrementer.c
#	modified:   src/modules/p_influxdb.c
#	modified:   src/modules/p_ip.c
#	modified:   src/modules/p_ipclient.c
#	modified:   src/modules/p_mangler.c
#	modified:   src/modules/p_mqttclient.c
#	modified:   src/modules/p_mysql.c
#	modified:   src/modules/p_perl5.c
#	modified:   src/modules/p_python3.c
#	modified:   src/modules/src_dummy.c
#	modified:   src/modules/src_file.c
#	modified:   src/modules/src_journal.c
#	modified:   src/modules/src_socket.c
#	modified:   src/modules/src_voltmonitor.c
#	modified:   src/perl5/xsub/lib/rrr/rrr_helper/rrr_debug.xs
#	modified:   src/rrr.c
#	modified:   src/rrr_auth.c
#	modified:   src/rrr_http_client.c
#	modified:   src/rrr_http_server.c
#	modified:   src/rrr_msg.c
#	modified:   src/rrr_msgdb.c
#	modified:   src/rrr_passwd.c
#	modified:   src/rrr_post.c
#	modified:   src/rrr_stats.c
#	modified:   src/tests/.gitignore
#	modified:   src/tests/Makefile.am
#	modified:   src/tests/modules/test_module.c
#	modified:   src/tests/modules/type_array.c
#	modified:   src/tests/send_fifo.c
#	modified:   src/tests/send_ip.c
#	modified:   src/tests/sha1/sha.c
#	modified:   src/tests/sha1/shatest.c
#	new file:   src/tests/sha256/shatest.c
#	modified:   src/tests/test.c
#	modified:   src/tests/test.sh.in
#	new file:   src/tests/test_allocator.c
#	new file:   src/tests/test_allocator.h
#	new file:   src/tests/test_cacher_1.conf
#	new file:   src/tests/test_cacher_2.conf
#	modified:   src/tests/test_condition.c
#	modified:   src/tests/test_conversion.c
#	modified:   src/tests/test_fixp.c
#	modified:   src/tests/test_json.c
#	new file:   src/tests/test_mmap_channel.c
#	new file:   src/tests/test_mmap_channel.h
#	modified:   src/tests/test_msgdb.c
#	modified:   src/tests/test_nullsafe.c
#
