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

Wyatt/1.3.5 merge conflicts #3971

Merged
merged 7 commits into from
Mar 23, 2021
Merged

Wyatt/1.3.5 merge conflicts #3971

merged 7 commits into from
Mar 23, 2021

Conversation

spacesailor24
Copy link
Contributor

Solving merge conflicts for #3966 (CHANGELOG.md) and includes some missing commits for patch release

spacesailor24 and others added 6 commits March 17, 2021 21:35
@spacesailor24 @slhodak
Rename tsc to compile (#3957) (#3958)
8b2291b 
* Change 'tsc' command in scripts & lerna run to 'compile'

* Update changelog

* Undo incorrect rename

* Checking if e2e test is deterministic

Co-authored-by: Sam Hodak <slhodak@gmail.com>

Co-authored-by: Sam Hodak <slhodak@gmail.com>
@spacesailor24 @thesuperb1
Debugging failing tests (#3959) (#3960)
88f59fe 
* Remote node provider edits

* remote node provider documentation edits

Co-authored-by: smudgil <38195323+smudgil@users.noreply.github.com>

Co-authored-by: smudgil <38195323+smudgil@users.noreply.github.com>
@spacesailor24 @LudwikJaniuk
Clarify commitment to semantic versioning (#3961) (#3962)
dc148e7 
see discussion in the issue #3758

Co-authored-by: LudwikJaniuk <ludvig.janiuk@gmail.com>

Co-authored-by: LudwikJaniuk <ludvig.janiuk@gmail.com>
@spacesailor24 @loredanacirstea
Feature/web3 eth iban es6 (#3964) (#3965)
888d107 
* Feature/web3 eth iban es6 (#3964)

* web3-eth-iban es6 rewrite - replace `var` with `const` and `let`

* web3-eth-iban es6 rewrite - replace object prototype with class

* web3-eth-iban code style fix

Co-authored-by: Loredana <loredana.cirstea@gmail.com>

* Update changelog

Co-authored-by: Loredana <loredana.cirstea@gmail.com>
@spacesailor24
Solve merge conflict
82c207c
@spacesailor24
Update changelog for PR 3961
c78df70
@spacesailor24 spacesailor24 added the P1 High severity bugs label Mar 23, 2021
frankiebee
frankiebee previously approved these changes Mar 23, 2021
View reviewed changes
Copy link
Contributor

@frankiebee frankiebee left a comment

Choose a reason for hiding this comment

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

woop woop

@spacesailor24 spacesailor24 reopened this Mar 23, 2021
@GregTheGreek GregTheGreek merged commit 42a2d92 into release/1.3.5 Mar 23, 2021
@GregTheGreek GregTheGreek deleted the wyatt/1.3.5-merge-conflicts branch March 23, 2021 15:42
@GregTheGreek
Copy link
Contributor

Note: Admin override do due github actions bug. Release branch will be tested regardless.

@spacesailor24 spacesailor24 restored the wyatt/1.3.5-merge-conflicts branch March 24, 2021 01:29
@spacesailor24 spacesailor24 deleted the wyatt/1.3.5-merge-conflicts branch March 24, 2021 01:36
@spacesailor24 spacesailor24 restored the wyatt/1.3.5-merge-conflicts branch March 24, 2021 01:38
@spacesailor24 spacesailor24 deleted the wyatt/1.3.5-merge-conflicts branch August 4, 2022 03:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GregTheGreek GregTheGreek GregTheGreek approved these changes

@frankiebee frankiebee frankiebee approved these changes

@koraykoska koraykoska Awaiting requested review from koraykoska

Assignees
No one assigned
Labels
P1 High severity bugs
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@spacesailor24 @GregTheGreek @frankiebee @Joumax14