Skip to content

Fixed new compile issue #6 (wrong artifact for sbt.io) #7

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

Merged
merged 3 commits into from
Apr 15, 2017

Conversation

phderome
Copy link
Contributor

@phderome phderome commented Apr 2, 2017

…Moved RateLimiter.scala (without any CircuitBreaker mind you) back to… Chapter12 as per book

Fixed sbt.IO dependency/artifact in build.scala and chapter13 (must have been in .ivy cache for rkuhn), removed some unused imports
directory change for MultiMasterCRDTSpec.scala (now chapter13)

Note: keep in mind that this code may well diverge from the zip on Manning's website.

… Chapter12 as per book

Fixed sbt.IO dependency in build.scala and chapter13 (must have been in .ivy cache for RKuhn), removed some unused imports
directory change for MultiMasterCRDTSpec.scala (now chapter13)
@phderome phderome changed the title Fixed new compile issue (wrong artifact for sbt.io, not in my .ivy) Fixed new compile issue #6 (wrong artifact for sbt.io, not in my .ivy) Apr 2, 2017
@phderome phderome changed the title Fixed new compile issue #6 (wrong artifact for sbt.io, not in my .ivy) Fixed new compile issue #6 (wrong artifact for sbt.io) Apr 2, 2017
Copy link
Member

@rkuhn rkuhn left a comment

Choose a reason for hiding this comment

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

Thanks!

@rkuhn
Copy link
Member

rkuhn commented Apr 13, 2017

It seems that my click on “update branch” did not trigger the clahub check, could you rebase on current master and force-push? That should get things going—and then you’ll have to sign the Apache 2 CLA to keep the lawyers happy (sorry about that; the link should pop up after the expected check failure).

@phderome
Copy link
Contributor Author

phderome commented Apr 13, 2017

Trying... I am not familiar with OSS git workflow(s). My understanding is that I should work from a forked version, which is normally the case for large projects. Are you actually making an exception and allowing me to contribute directly without fork being needed (as I usually do it at work on a private repo)? There's some security surrounding that about designated project collaborators; see my quote below.

I also see clahub Waiting for status to be reported and a Required label.

As for the signed CLA, I printed, scanned, and signed to common email addresses tied to your name.

The github.com view of the PR I see shows:
This pull request can be automatically merged by project collaborators
Only those with write access to this repository can merge pull requests.

@phderome
Copy link
Contributor Author

I did a sync of upstream/master (the official repo Roland maintains) to my forked branch. Not sure what I can do here, now. Maybe a new fresh PR?

@rkuhn
Copy link
Member

rkuhn commented Apr 15, 2017

Hmm, not sure what got stuck here and how to get it unstuck. Thanks for the mailed CLA, to keep records in one place would you mind signing electronically?

@rkuhn rkuhn merged commit 7f5fcb6 into ReactiveDesignPatterns:master Apr 15, 2017
@phderome
Copy link
Contributor Author

I signed, not sure if you did anything to fix, but whatever it is done. I will be back in a week.

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