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

Codebase synchronization against jruby-1_7 #43

Merged
merged 7 commits into from
Feb 17, 2014

Conversation

abstractj
Copy link

No description provided.

@vipulnsward
Copy link
Member

@abstractj Things fail on jruby-head?

@abstractj
Copy link
Author

@vipulnsward that was added due to the issues on Travis travis-ci/travis-ci#1502 with RVM. Now that RVM was updated, I did the rollback.

@vipulnsward
Copy link
Member

@abstractj Seems hmac specs are erroring out on jruby-head.

@@ -1,12 +1,13 @@
module Krypt
class HMAC
include Krypt::Helper::XOR
Copy link
Member

Choose a reason for hiding this comment

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

@abstractj just trying to get a hang of things here. This was replaced by Martin. You reverted this for some reason?

@abstractj
Copy link
Author

@vipulnsward sorry, I missed that. You are correct, it doesn't make sense

Speaking about jruby-head master will fail I guess for different reasons, look this is the output from master https://travis-ci.org/krypt/krypt/jobs/18268779#L6565

@abstractj abstractj merged commit c9627b9 into krypt:master Feb 17, 2014
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.

None yet

3 participants