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

Fix conflicts 0.34 #4037

Merged
merged 14 commits into from Apr 3, 2019
Merged

Fix conflicts 0.34 #4037

merged 14 commits into from Apr 3, 2019

Conversation

gamarin2
Copy link
Contributor

@gamarin2 gamarin2 commented Apr 3, 2019

Fix conflicts

  • Linked to github-issue with discussion and accepted design OR link to spec that describes this work.
  • Wrote tests
  • Updated relevant documentation (docs/)
  • Added a relevant changelog entry: sdkch add [section] [stanza] [message]
  • rereviewed Files changed in the github PR explorer

For Admin Use:

  • Added appropriate labels to PR (ex. wip, ready-for-review, docs)
  • Reviewers Assigned
  • Squashed all commits, uses message "Merge pull request #XYZ: [title]" (coding standards)

alexanderbez
alexanderbez reviewed Apr 3, 2019
View reviewed changes
docs/gaia/installation.md Outdated
@@ -25,7 +25,7 @@ If necessary, make sure you `git checkout` the correct
[released version](https://github.com/cosmos/cosmos-sdk/releases).

::: warning
For the mainnet, make sure your version if greater than `v0.33.0`
For the mainnet, make sure your version if greather than `v0.33.0`
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this is wrong?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

good catch, yes

@alexanderbez alexanderbez merged commit ecba8a1 into release/v0.34.0 Apr 3, 2019
@alexanderbez alexanderbez deleted the fix-conflicts-0.34 branch April 3, 2019 14:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexanderbez alexanderbez alexanderbez approved these changes

@cwgoes cwgoes Awaiting requested review from cwgoes

@ebuchman ebuchman Awaiting requested review from ebuchman

@rigelrozanski rigelrozanski Awaiting requested review from rigelrozanski

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@gamarin2 @alexanderbez @jackzampolin @cwgoes