Merge develop to hardfork #1947
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
oxarbitrage
previously approved these changes
Aug 20, 2019
pmconrad
previously approved these changes
Aug 21, 2019
Merged
jmjatlanta
force-pushed
the
develop_hardfork
branch
from
d9ef9ea to
fc32b11
Compare
|
I have updated this PR with the latest develop code. Sorry for causing the stale reviews, but I believe these latest changes are important, especially for building. Update: These latest commits do not look right. I am reviewing. Please do not review just yet. |
…had libcurl issues (have the issue on telegram) Updated bitsharesentry.sh to add support to the BITSHARESD_ES_START_AFTER_BLOCK env var, to tell the witness_node to only start throwing data onto ES after the specified block Updated default_config as per test-3.2.0 release
FROM Image is now phusion/baseimage:0.11 Commented Out required-participation from default_config.ini
Move market_ticket constrctors to api_objects.cpp; move price_to_string(...) to util.hpp and util.cpp.
Due to #1885, need to force a replay.
Change 2: Based on review comments to retain the previous code
removed unused variables
jmjatlanta
force-pushed
the
develop_hardfork
branch
2 times, most recently
from
877fc5f to
5d9704a
Compare
|
Closing in favor of #1972. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR will update the
hardforkbranch with the changes fromdevelop