Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

Comments

CLIMATE-523 Integrate mccsearch module into master branch#113

Merged
asfgit merged 16 commits intoapache:masterfrom
kwhitehall:mccsearch
Oct 16, 2014
Merged

CLIMATE-523 Integrate mccsearch module into master branch#113
asfgit merged 16 commits intoapache:masterfrom
kwhitehall:mccsearch

Conversation

@lewismc
Copy link
Member

@lewismc lewismc commented Oct 13, 2014

This is a pull request for https://issues.apache.org/jira/browse/CLIMATE-523.
The code is in sync with master branch and can be merged.
I've just noticed that we may need to address license headers for all files.
There are some issues (0) which @kwhitehall has identified as being in need of some attention. We can and will move these over to the climate Jira instance.
My thinking here is that we merge this code into master, we then hash out the TODO's and iron out the minor things in line with the process of flushing out some of Kim's knowledge onto the website as documentation.
Great work on this Kim, it is very exciting to see your code making it in to Climate.
(0) https://github.com/kwhitehall/climate/issues

@OCWJenkins
Copy link

Can one of the admins verify this patch?

@MJJoyce
Copy link
Member

MJJoyce commented Oct 15, 2014

Hey @lewismc. Super awesome getting this up. it looks like this PR might need cleaned up a bit perhaps. Maybe a rebase to get everything caught up judging from some of the extremely early commits here (like 1201406). Squashing some commits might help as well.

Awesome job on this!

@lewismc
Copy link
Member Author

lewismc commented Oct 15, 2014

@MJJoyce, the bogus early commits are now removed after rebase.
For the time being I've retained the commit trail as I personally don't know what @kwhitehall wants to do with regards to squashing her commits. I am not bothered either way.
What I do not want to do is bugger up the rebasing effort. If you have an objection to us merging this branch with master as is then we can explore the squashing effort. I am not too fused and would quite like to see if merged as is is at all possible.

@MJJoyce
Copy link
Member

MJJoyce commented Oct 16, 2014

+1 @lewismc, I'm fine with the incremental progress commits on this one given the amount of effort you've put into just getting it to this point. Let's just get it in there sooner rather than later and be nitpicky on other stuff =)

@asfgit asfgit merged commit 26b6c91 into apache:master Oct 16, 2014
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.

5 participants