Merge release branch to master for 3.3.0 #1970
Merged
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
…stant duplicities
…lt_expiration_as_constant cli wallet transaction default expiration as constant
Enable undo_db earlier during replay
add htlc parameters to developer genesis
Merge release branch back to develop branch
Merge 3.2.1 hotfix back to develop branch
Move market_ticket constrctors to api_objects.cpp; move price_to_string(...) to util.hpp and util.cpp.
Fix broken build
Database_api code refactory
Fix Windows linker error
Merge develop to release for 3.3.0 release candidate
pthread fix for mac
fix hf_935_test in testnet
Due to #1885, need to force a replay.
Bump DB_VERSION
Fix build (Linux/Clang)
Editline fix
pmconrad
approved these changes
Sep 2, 2019
oxarbitrage
approved these changes
Sep 2, 2019
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 will merge the release branch into master in preparation for the 3.3.0 release of Bitshares Core.