Code

merge release/2.5.0.0.5 to master#4947

Code

Merged

wileyj merged 8 commits intomasterstacks-network/stacks-core:masterfrom release-to-master-1720025568stacks-network/stacks-core:release-to-master-1720025568Copy head branch name to clipboardJul 3, 2024

+8-1

Commits

Commits on Jul 1, 2024

• change defatult antientropy_retry to one hour

  wileyj

  committed
  43216b1

  Copy full SHA for 43216b1

• Adjust Changlog text

  wileyj

  committed
  6f498b0

  Copy full SHA for 6f498b0

• fix formatting

  wileyj

  committed
  ad14bed

  Copy full SHA for ad14bed

• Merge pull request #4935 from stacks-network/chore/default-antientropy-retry

  Show description for 51ae55d
  wileyj

  authored
  51ae55d

  Copy full SHA for 51ae55d

• fix typo in version number

  wileyj

  committed
  ebd17f4

  Copy full SHA for ebd17f4

• fix typo: rety->retry

  wileyj

  committed
  ea394b7

  Copy full SHA for ea394b7

Commits on Jul 2, 2024

• Merge branch 'release/2.5.0.0.5' into chore/default-antientropy-retry

  wileyj

  authored
  672cb4a

  Copy full SHA for 672cb4a

• Merge pull request #4940 from stacks-network/chore/default-antientropy-retry

  Show description for e29ef68
  wileyj

  authored
  e29ef68

  Copy full SHA for e29ef68