Skip to content

Conversation

@codablock
Copy link

This backports a single commit from #2735 in 0.13.2.

@codablock codablock added this to the 13.2 milestone Mar 12, 2019
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@UdjinM6 UdjinM6 merged commit 548a489 into dashpay:v0.13.x Mar 12, 2019
MIPPL pushed a commit to biblepay/biblepay that referenced this pull request May 26, 2019
* commit '4570079e53ad859c571aeac3f132cf2969888e14':
  Add missing entry to changelog (dashpay#2769)
  Move IS block filtering into ConnectBlock (dashpay#2766)
  [0.13.x] Bump version to 0.13.2 and add release notes (dashpay#2749)
  Bump minChainWork and AssumeValid to block #1033120 (dashpay#2750)
  Fix error message for invalid voting addresses (dashpay#2747)
  Make -masternodeblsprivkey mandatory when -masternode is given (dashpay#2745)
  Implement 2-stage commit for CEvoDB to avoid inconsistencies after crashes (dashpay#2744)
  Add collateraladdress into masternode/protx list rpc output (dashpay#2740)
  Only include selected TX types into CMerkleBlock (dashpay#2737)
  Stop g_connman first before deleting it (dashpay#2734)
  Fix incorrect usage of begin() when genesis block is requested in "protx diff" (dashpay#2699)
  Do not process blocks in CDeterministicMNManager before dip3 activation (dashpay#2698)
  Backport bitcoin#14701: build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (dashpay#2687)
  Fix some typos in doc/guide-startmany.md (dashpay#2711)
  Minimal fix for litemode vs bad-protx-key-not-same issue (dashpay#2694)
  Release notes v0.13.1.0 (dashpay#2689)

# Conflicts:
#	configure.ac
#	doc/guide-startmany.md
#	doc/release-notes.md
#	src/chainparams.cpp
#	src/clientversion.h
#	src/validation.cpp
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.

2 participants