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.

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

update for ouroboros-network #187

Merged
merged 3 commits into from
Sep 13, 2019
Merged

Conversation

avieth
Copy link
Contributor

@avieth avieth commented Sep 13, 2019

No description provided.

@Jimbo4350 Jimbo4350 mentioned this pull request Sep 13, 2019
@@ -111,8 +111,8 @@ data TraceOptions = TraceOptions
, traceDnsResolver :: !Bool
}

type ConsensusTraceOptions = Consensus.Tracers' () () (Const Bool)
type ProtocolTraceOptions = ProtocolTracers' () () () (Const Bool)
type ConsensusTraceOptions = Consensus.Tracers' () () () (Const Bool)
Copy link
Contributor

Choose a reason for hiding this comment

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

Any reason for the spaces here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I thought people here liked this kind of alignment. I don't really care either way.

Copy link
Contributor

@Jimbo4350 Jimbo4350 left a comment

Choose a reason for hiding this comment

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

LGTM! ./scripts/shelley-testnet2.sh appears to be working as well. Just two conflicts to fix below.

@avieth avieth force-pushed the avieth/ouroboros-network-rev branch from 5e9152d to 7b41737 Compare September 13, 2019 15:08
@avieth
Copy link
Contributor Author

avieth commented Sep 13, 2019

bors r+

iohk-bors bot added a commit that referenced this pull request Sep 13, 2019
187: update for ouroboros-network r=avieth a=avieth



Co-authored-by: Alexander Vieth <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Sep 13, 2019

@iohk-bors iohk-bors bot merged commit cabe7d2 into master Sep 13, 2019
@iohk-bors iohk-bors bot deleted the avieth/ouroboros-network-rev branch September 13, 2019 17:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants