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

Jump to bottom

5.0.7 conflict #1009

Merged
merged 7 commits into from
Oct 5, 2021
Merged

5.0.7 conflict #1009

merged 7 commits into from
Oct 5, 2021

Conversation

tac0turtle
Copy link
Member

Closes: #XXX

Description

For contributor use:

  • Targeted PR against correct branch (see CONTRIBUTING.md)
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
  • Code follows the module structure standards.
  • Wrote unit and integration tests
  • Updated relevant documentation (docs/) or specification (x/<module>/spec/)
  • Added relevant godoc comments.
  • Added a relevant changelog entry to the Unreleased section in CHANGELOG.md
  • Re-reviewed Files changed in the Github PR explorer

For admin use:

  • Added appropriate labels to PR (ex. WIP, R4R, docs, etc)
  • Reviewers assigned
  • Squashed all commits, uses message "Merge pull request #XYZ: [title]" (coding standards)

okwme and others added 7 commits July 30, 2021 18:02
@okwme @faddat @alexanderbez
Rc0/v5.0.3 (#929)
9db90aa 
* chore: version bump SDK (#924)

* chore: update sdk release (#928)

* chore: update sdk release

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* chore: update changelog

Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>
@okwme
Rc0/v5.0.5 (#934)
2531f5c 
* cherrypick commits for v5.0.5

* chore: update changelog
@okwme
Rc0/v5.0.6 (#970)
8defbe0 
* chore: fix conflicts from stalled release of tendermint v0.34.12

* chore: update changelog
@okwme
Rc0/v5.0.7 (#1004)
25bdd71 
* gaia: bump SDK (#1002)

* gaia: bump SDK

* chore: fix go sum

* chore: changelog
Merge branch 'release/v5.0.x' into release/v5.0.7
3595709
fix second conflict
27a49cd
bring back changes
07fa3b1
@tac0turtle tac0turtle changed the base branch from release/v5.0.7 to release/v5.0.x October 5, 2021 14:04
@tac0turtle tac0turtle marked this pull request as ready for review October 5, 2021 14:05
@yaruwangway yaruwangway merged commit f6f354d into release/v5.0.x Oct 5, 2021
@yaruwangway yaruwangway deleted the 5.0.7_conflict branch October 5, 2021 15:41
@yaruwangway yaruwangway mentioned this pull request Oct 5, 2021
Closed
11 tasks
yaruwangway added a commit that referenced this pull request Oct 14, 2021
@yaruwangway @okwme
@faddat @alexanderbez @tac0turtle
merge Rcn/v5.0.8 to release/v5.0.8 (#1022)
b6732bb 
* Release/v5.0.6 (#1001)

* Rc0/v5.0.3 (#929)

* chore: version bump SDK (#924)

* chore: update sdk release (#928)

* chore: update sdk release

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* chore: update changelog

Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Rc0/v5.0.5 (#934)

* cherrypick commits for v5.0.5

* chore: update changelog

* Rc0/v5.0.6 (#970)

* chore: fix conflicts from stalled release of tendermint v0.34.12

* chore: update changelog

Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* gaia: bump SDK (#1002)

* gaia: bump SDK

* chore: fix go sum

* 5.0.7 conflict (#1009)

* Rc0/v5.0.3 (#929)

* chore: version bump SDK (#924)

* chore: update sdk release (#928)

* chore: update sdk release

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* chore: update changelog

Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Rc0/v5.0.5 (#934)

* cherrypick commits for v5.0.5

* chore: update changelog

* Rc0/v5.0.6 (#970)

* chore: fix conflicts from stalled release of tendermint v0.34.12

* chore: update changelog

* Rc0/v5.0.7 (#1004)

* gaia: bump SDK (#1002)

* gaia: bump SDK

* chore: fix go sum

* chore: changelog

* fix second conflict

* bring back changes

Co-authored-by: billy rennekamp <[email protected]>
Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>
Co-authored-by: Marko Baricevic <[email protected]>

* Backport/for v5.0.8 (#1011)

* feat: add ibc-antehandler to the default handlers

* fix: testnet cli command update genesis supply

* chore: fix lint

Co-authored-by: billy rennekamp <[email protected]>

* CHANGELOG: release v5.0.8

Co-authored-by: billy rennekamp <[email protected]>
Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>
Co-authored-by: Marko <[email protected]>
Co-authored-by: Marko Baricevic <[email protected]>
yaruwangway added a commit that referenced this pull request Oct 14, 2021
@yaruwangway @okwme
@faddat @alexanderbez @tac0turtle
merge Rcn/v5.0.8 to release/v5.0.8 (#1023)
b72cc99 
* Release/v5.0.6 (#1001)

* Rc0/v5.0.3 (#929)

* chore: version bump SDK (#924)

* chore: update sdk release (#928)

* chore: update sdk release

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* chore: update changelog

Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Rc0/v5.0.5 (#934)

* cherrypick commits for v5.0.5

* chore: update changelog

* Rc0/v5.0.6 (#970)

* chore: fix conflicts from stalled release of tendermint v0.34.12

* chore: update changelog

Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* gaia: bump SDK (#1002)

* gaia: bump SDK

* chore: fix go sum

* 5.0.7 conflict (#1009)

* Rc0/v5.0.3 (#929)

* chore: version bump SDK (#924)

* chore: update sdk release (#928)

* chore: update sdk release

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* chore: update changelog

Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Rc0/v5.0.5 (#934)

* cherrypick commits for v5.0.5

* chore: update changelog

* Rc0/v5.0.6 (#970)

* chore: fix conflicts from stalled release of tendermint v0.34.12

* chore: update changelog

* Rc0/v5.0.7 (#1004)

* gaia: bump SDK (#1002)

* gaia: bump SDK

* chore: fix go sum

* chore: changelog

* fix second conflict

* bring back changes

Co-authored-by: billy rennekamp <[email protected]>
Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>
Co-authored-by: Marko Baricevic <[email protected]>

* Backport/for v5.0.8 (#1011)

* feat: add ibc-antehandler to the default handlers

* fix: testnet cli command update genesis supply

* chore: fix lint

Co-authored-by: billy rennekamp <[email protected]>

* CHANGELOG: release v5.0.8

* fix: link

Co-authored-by: billy rennekamp <[email protected]>
Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>
Co-authored-by: Marko <[email protected]>
Co-authored-by: Marko Baricevic <[email protected]>
okwme added a commit that referenced this pull request Nov 16, 2021
@yaruwangway @okwme
@faddat @alexanderbez @tac0turtle
merge release/v5.0.8 to release/v5.0.x (#1052)
df0f62e 
* Rc0/v5.0.3 (#929)

* chore: version bump SDK (#924)

* chore: update sdk release (#928)

* chore: update sdk release

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* chore: update changelog

Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Rc0/v5.0.5 (#934)

* cherrypick commits for v5.0.5

* chore: update changelog

* Rc0/v5.0.6 (#970)

* chore: fix conflicts from stalled release of tendermint v0.34.12

* chore: update changelog

* Rc0/v5.0.7 (#1004)

* gaia: bump SDK (#1002)

* gaia: bump SDK

* chore: fix go sum

* chore: changelog

* merge Rcn/v5.0.8 to release/v5.0.8 (#1022)

* Release/v5.0.6 (#1001)

* Rc0/v5.0.3 (#929)

* chore: version bump SDK (#924)

* chore: update sdk release (#928)

* chore: update sdk release

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* chore: update changelog

Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Rc0/v5.0.5 (#934)

* cherrypick commits for v5.0.5

* chore: update changelog

* Rc0/v5.0.6 (#970)

* chore: fix conflicts from stalled release of tendermint v0.34.12

* chore: update changelog

Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* gaia: bump SDK (#1002)

* gaia: bump SDK

* chore: fix go sum

* 5.0.7 conflict (#1009)

* Rc0/v5.0.3 (#929)

* chore: version bump SDK (#924)

* chore: update sdk release (#928)

* chore: update sdk release

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* chore: update changelog

Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Rc0/v5.0.5 (#934)

* cherrypick commits for v5.0.5

* chore: update changelog

* Rc0/v5.0.6 (#970)

* chore: fix conflicts from stalled release of tendermint v0.34.12

* chore: update changelog

* Rc0/v5.0.7 (#1004)

* gaia: bump SDK (#1002)

* gaia: bump SDK

* chore: fix go sum

* chore: changelog

* fix second conflict

* bring back changes

Co-authored-by: billy rennekamp <[email protected]>
Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>
Co-authored-by: Marko Baricevic <[email protected]>

* Backport/for v5.0.8 (#1011)

* feat: add ibc-antehandler to the default handlers

* fix: testnet cli command update genesis supply

* chore: fix lint

Co-authored-by: billy rennekamp <[email protected]>

* CHANGELOG: release v5.0.8

Co-authored-by: billy rennekamp <[email protected]>
Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>
Co-authored-by: Marko <[email protected]>
Co-authored-by: Marko Baricevic <[email protected]>

* merge Rcn/v5.0.8 to release/v5.0.8 (#1023)

* Release/v5.0.6 (#1001)

* Rc0/v5.0.3 (#929)

* chore: version bump SDK (#924)

* chore: update sdk release (#928)

* chore: update sdk release

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* chore: update changelog

Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Rc0/v5.0.5 (#934)

* cherrypick commits for v5.0.5

* chore: update changelog

* Rc0/v5.0.6 (#970)

* chore: fix conflicts from stalled release of tendermint v0.34.12

* chore: update changelog

Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* gaia: bump SDK (#1002)

* gaia: bump SDK

* chore: fix go sum

* 5.0.7 conflict (#1009)

* Rc0/v5.0.3 (#929)

* chore: version bump SDK (#924)

* chore: update sdk release (#928)

* chore: update sdk release

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* chore: update changelog

Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Rc0/v5.0.5 (#934)

* cherrypick commits for v5.0.5

* chore: update changelog

* Rc0/v5.0.6 (#970)

* chore: fix conflicts from stalled release of tendermint v0.34.12

* chore: update changelog

* Rc0/v5.0.7 (#1004)

* gaia: bump SDK (#1002)

* gaia: bump SDK

* chore: fix go sum

* chore: changelog

* fix second conflict

* bring back changes

Co-authored-by: billy rennekamp <[email protected]>
Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>
Co-authored-by: Marko Baricevic <[email protected]>

* Backport/for v5.0.8 (#1011)

* feat: add ibc-antehandler to the default handlers

* fix: testnet cli command update genesis supply

* chore: fix lint

Co-authored-by: billy rennekamp <[email protected]>

* CHANGELOG: release v5.0.8

* fix: link

Co-authored-by: billy rennekamp <[email protected]>
Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>
Co-authored-by: Marko <[email protected]>
Co-authored-by: Marko Baricevic <[email protected]>

Co-authored-by: billy rennekamp <[email protected]>
Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>
Co-authored-by: Marko <[email protected]>
Co-authored-by: Marko Baricevic <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yaruwangway yaruwangway yaruwangway approved these changes

@alessio alessio Awaiting requested review from alessio

@alexanderbez alexanderbez Awaiting requested review from alexanderbez

@jgimeno jgimeno Awaiting requested review from jgimeno

@zmanian zmanian Awaiting requested review from zmanian zmanian is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tac0turtle @yaruwangway @okwme