Skip to content
This repository was archived by the owner on Aug 2, 2022. It is now read-only.

Third try at getting a clean commit pushed. #1614#1804

Merged
heifner merged 20 commits intomasterfrom
merge-664-try-3
Mar 23, 2018
Merged

Third try at getting a clean commit pushed. #1614#1804
heifner merged 20 commits intomasterfrom
merge-664-try-3

Conversation

@pmesnier
Copy link
Contributor

I was unable to get my conflicts in try 2 resolved so I did a squash-merge into a new branch again.
Hopefully third time's a charm!

dhaneshvb and others added 7 commits March 23, 2018 14:49
Removed unused (and no longer appropriate) consecutive block production
condition.

Updated producer plugin required-participation option to take integer
rather than bool.

Removed check for low participation for now. We will need to implement a
better metric for low participation eventually. I am keeping the
required-participation option (even though it will effectively be
ignored) because it will eventually be used with the new low
participation metric.
@@ -1,4 +1,4 @@
#!/bin/bash
%#!/bin/bash
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like this slipped in.

Copy link
Contributor

@heifner heifner left a comment

Choose a reason for hiding this comment

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

This PR removes nodeos_run_remote.py test. A follow-on PR will add this test back in.

@heifner heifner merged commit a7f2601 into master Mar 23, 2018
@heifner heifner deleted the merge-664-try-3 branch March 23, 2018 22:36
@gleehokie gleehokie added this to the RC1 milestone Apr 7, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants