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.

Sign up for GitHub

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

Merge master to develop (3.1.0.0.2) via intermediary branch #5607

Merged
merged 17 commits into from
Jan 8, 2025
Merged

Merge master to develop (3.1.0.0.2) via intermediary branch #5607

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
230a946
Merge pull request #5528 from stacks-network/release/3.0.0.0.4
wileyj Dec 4, 2024
49777d3
Merge pull request #5540 from stacks-network/chore/3.1.0.0.0_changelog
wileyj Dec 8, 2024
b0d9179
Merge pull request #5546 from stacks-network/release/3.1.0.0.0
wileyj Dec 9, 2024
70d24ea
Merge pull request #5557 from stacks-network/release/3.1.0.0.1
wileyj Dec 11, 2024
04fbd00
fix: set epoch to 3.1 in Clarity DB
obycode Dec 11, 2024
d99d566
chore: set new 3.1 epoch marker
jcnelson Dec 11, 2024
8e02cf0
chore: check both clarity tx and clarity db epoch versions at each ep…
jcnelson Dec 11, 2024
56ded53
chore: add changelog
obycode Dec 12, 2024
97910c5
Adding changelog for 3.1.0.0.2.x
wileyj Dec 13, 2024
3d0861f
Merge branch 'develop' into chore/3.1.0.0.2_changelog
wileyj Dec 20, 2024
f97a6be
re-adding line from e486b9e19e9bc2c73835d3f7cb6c9c1a3f5e6153
wileyj Dec 20, 2024
c251141
Merge branch 'develop' into chore/3.1.0.0.2_changelog
wileyj Dec 20, 2024
0279bc0
Do not process block validation responses for the wrong reward cycle
jferrant Dec 23, 2024
1eb9924
Add changelog
jferrant Dec 23, 2024
d930f44
FIx changelog
jferrant Dec 23, 2024
afdb277
Merge branch 'develop' into chore/3.1.0.0.2_changelog
jcnelson Jan 3, 2025
015221b
Merge branch 'develop' into chore/3.1.0.0.2_changelog
wileyj Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: add changelog
  • Loading branch information
@obycode
obycode committed Dec 12, 2024
commit 56ded5342eef74555e6a82e29b36939da8e8f24c
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE

### Added

- Set the epoch to 3.1 in the Clarity DB upon activation.

### Changed

## [3.1.0.0.1]
Expand Down