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

Plasma restructure #304

Merged
merged 178 commits into from
Aug 11, 2015
Merged

Plasma restructure #304

merged 178 commits into from
Aug 11, 2015

Conversation

wkerzendorf
Copy link
Member

Very extensive restructure of the plasma calculation.

@landscape-bot
Copy link

Code Health
Repository health decreased by 1% when pulling 95a067f on plasma/restructure into 8122c70 on master.

@landscape-bot
Copy link

Code Health
Repository health decreased by 1% when pulling 871caa5 on plasma/restructure into 8122c70 on master.

@landscape-bot
Copy link

Code Health
Repository health decreased by 1% when pulling 050997f on plasma/restructure into 8122c70 on master.

@landscape-bot
Copy link

Code Health
Repository health decreased by 1% when pulling 0ac6a94 on plasma/restructure into 8122c70 on master.

@landscape-bot
Copy link

Code Health
Repository health decreased by 1% when pulling 815092d on plasma/restructure into 8122c70 on master.

@aoifeboyle
Copy link
Contributor

@wkerzendorf I've finished adding the tests I wanted and I'd be happy to merge now.

@wkerzendorf
Copy link
Member Author

@aoifeboyle we need to rebase

@aoifeboyle
Copy link
Contributor

Ok @wkerzendorf I can do it I think

@wkerzendorf
Copy link
Member Author

@ssim this is a massive merge - can you look at this as well.

@aoifeboyle
Copy link
Contributor

@wkerzendorf Did you do the rebase?

@wkerzendorf
Copy link
Member Author

I did a merge - but there seem to be problems. Can you check

@aoifeboyle
Copy link
Contributor

Yeah sure

@wkerzendorf
Copy link
Member Author

@aoifeboyle plasma_array also still exists in this branch.

wkerzendorf added a commit that referenced this pull request Aug 11, 2015
@wkerzendorf wkerzendorf merged commit 41d8fcd into master Aug 11, 2015
@aoifeboyle
Copy link
Contributor

@wkerzendorf did you just merge this? I removed some tests that still made use of functions in plasma_array and I'm still working through correcting them. But it should function fine if you merged it.

@wkerzendorf
Copy link
Member Author

@aoifeboyle yep - more or less accidently. let's see how it goes. There is a revert PR. just make anew PR for your fixes.

@wkerzendorf
Copy link
Member Author

you are number 3 behind vytas and myself

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.

4 participants