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

Fixed compilation and execution for CDH 5+ #22

Merged
merged 1 commit into from
Apr 27, 2015
Merged

Conversation

mageru
Copy link

@mageru mageru commented Apr 7, 2015

I fixed the project so that it could compile and run on the newest versions of Hadoop and Hive.

I did however remove some of the failing test files just to get it working.

@wnagele
Copy link
Contributor

wnagele commented Apr 7, 2015

We cannot merge this. Existing tests have to be ported to the new interfaces - we will not be giving up test coverage when moving to the next major release. Can you please look into porting those?

@wnagele wnagele closed this Apr 7, 2015
@wnagele wnagele reopened this Apr 7, 2015
@mageru
Copy link
Author

mageru commented Apr 11, 2015

Tests re-instated as required.

@wnagele
Copy link
Contributor

wnagele commented Apr 11, 2015

Few comments - please rebase your commits and squash (http://fle.github.io/git-tip-keep-your-branch-clean-with-fixup-and-autosquash.html) them down to a single one - only including the relevant changes.

@mageru
Copy link
Author

mageru commented Apr 11, 2015

Thanks for the guidance and the pro-tip. I was unaware of the fixup feature.

@wnagele
Copy link
Contributor

wnagele commented Apr 12, 2015

Did you do the fixup yet? If so - you'll have to do a git push -f as it will conflict with your previous commits.

@mageru
Copy link
Author

mageru commented Apr 12, 2015

I thought I had. I will try it again.

@mageru
Copy link
Author

mageru commented Apr 12, 2015

Justin@JUSTIN-PC ~/IdeaProjects/hadoop-pcap (master)
$ git commit --fixup 8464a85
On branch master
Your branch is up-to-date with 'origin/master'.

Untracked files:
.idea/
hadoop-pcap-lib/hadoop-pcap-lib.iml
hadoop-pcap-lib/target/
hadoop-pcap-root.iml
hadoop-pcap-serde/hadoop-pcap-serde.iml

nothing added to commit but untracked files present

Justin@JUSTIN-PC ~/IdeaProjects/hadoop-pcap (master)
$ git push -f origin master
Username for 'https://github.com': mageru
Password for 'https://mageru@github.com':
Everything up-to-date

@wnagele
Copy link
Contributor

wnagele commented Apr 12, 2015

$ git rebase -i HEAD~5

Then change to 'fixup' all the commits you wanna merge up. Change the primary commit to 'reword' and give it a description such as "Change to support CDH5".

@mageru mageru force-pushed the master branch 2 times, most recently from 4268e1f to 7aa47d6 Compare April 12, 2015 03:55
@mageru
Copy link
Author

mageru commented Apr 12, 2015

Thank you very much for your help and guidance :)
With your help I believe I have wrapped it all into one clean commit.

@wnagele
Copy link
Contributor

wnagele commented Apr 12, 2015

Few more nits - we are getting there. ;)

@mageru
Copy link
Author

mageru commented Apr 12, 2015

Thanks, I will work through the details and got another push out.

@mageru
Copy link
Author

mageru commented Apr 27, 2015

Anything else?

wnagele added a commit that referenced this pull request Apr 27, 2015
Fixed compilation and execution for CDH 5+
@wnagele wnagele merged commit f56490f into RIPE-NCC:master Apr 27, 2015
@wnagele
Copy link
Contributor

wnagele commented Apr 27, 2015

All done. Thanks!

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