search

illinois-cs241 / broadway

A distributed systems framework used running distributable workloads.
Other
18 stars 0 forks source link

Merge API and grader #3

Closed zhengyao-lin closed 4 years ago

zhengyao-lin commented 4 years ago

Sorry it's getting a bit messy. I was trying to actually merge the two repos so that we can keep the commit history

The original PR is https://github.com/illinois-cs241/broadway/pull/1, which somehow got closed when I force-pushed a completely different branch.

The head of this branch should look identical to the one used in https://github.com/illinois-cs241/broadway/pull/1, except that we have all the old commits listed below

please see the head tree for "diff": https://github.com/illinois-cs241/broadway/tree/merge-api-grader

ayushr2 commented 4 years ago

So bdaf7233c24a64bc8f1473423f1109e675a82370 is the commit from which we need to review? (as everything before that was reviewed in illinois-cs241/broadway-api#72)

ayushr2 commented 4 years ago

Good stuff though, definitely worth having the commit history (with my awesome commit messages as you can see in 125aa8146979efe15742e0d1b4e36d71ddbfdc04). I can not see the diff for the broadway-grader commits somehow... like b44a6aac711f0bc1935592b74b39817efac1bb1b.

You know if there is some way to import all the issues too?

zhengyao-lin commented 4 years ago

yeah.. i think i did something weird. i'll figure it out tomorrow.

zhengyao-lin commented 4 years ago

I don't think I can import the issues. But the branch should be fine. Since I rebased the entire grader on top of the most recent api branch, the diff between bdaf723 and this branch doesn't work.

But this diff is close enough (skipping bdaf723) https://github.com/illinois-cs241/broadway/compare/478a434...merge-api-grader