Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update master #166

Open
wants to merge 157 commits into
base: master
Choose a base branch
from
Open

Update master #166

wants to merge 157 commits into from

Conversation

larryk85
Copy link
Contributor

Update master to be at parity with the eosio branch.

johndebord and others added 30 commits June 10, 2020 17:44
- Escape Unicode C1 control code points.

Co-Authored-By: Kevin Heifner [email protected]
heifner and others added 30 commits July 6, 2021 09:18
Update Zipkin connection retry
add includes needed for boost 1.77
add includes needed for boost 1.77 - 2.2
[eosio] Cancel timer and don't access my when shutdown to fix core-dump
[2.2.x] Cancel timer and don't access my when shutdown to fix core-dump
fix fc_create_trace

change macro to inline functions

add debug message

add create_trace_with_start_time

use lagacy format for zipkin

add fc_trace_log

address PR comments

add zipkin wait mechanism

address PR comments

fix indent

fix compile problem

# Conflicts:
#	src/network/http/http_client.cpp

add fc_create_trace_with_id_if()
fix fc_create_trace

change macro to inline functions

add debug message

add create_trace_with_start_time

use lagacy format for zipkin

add fc_trace_log

address PR comments

add zipkin wait mechanism

address PR comments

fix indent

fix compile problem

# Conflicts:
#	src/network/http/http_client.cpp

add fc_create_trace_with_id_if()
Fix deepmind log not reset properly 2.2.x
Fix deepmind log not reset properly eosio
# Conflicts:
#	include/fc/log/trace.hpp
Fix segfault on shutdown and reduce log spam - eosio
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.