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.

Sign up for GitHub

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

Jump to bottom

Roll-back #1301 and #1289 to allow 0.7.0 release. #1305

Closed
wants to merge 1 commit into from
Closed

Roll-back #1301 and #1289 to allow 0.7.0 release. #1305

wants to merge 1 commit into from

Commits on Aug 20, 2016

  1. Roll-back typelevel#1301 and typelevel#1289 to allow 0.7.0 release. 

    Due to a communications error we merged some PRs which we had been
planning to keep out of master until after 0.7.0. Since one of them
(typelevel#1289) was large and long-running, it was difficult to undo this
merge in an automated way.

This commit represents the following:

 1. Downloaded patches for PRs 1301 and 1289 from Github
 2. Tried to reverse-apply them (-R)
 3. Fixed rejections/failures manually
 4. Got code compiling and tests passing

The code is now different than it was before the PRs were merged,
but things *seem* to be in a reasonable state. I'm keeping all these
changes in one commit so that it will be easier to "reverse" this
once 0.7.0 is relaesed.
    @erik-stripe @non
    erik-stripe authored and non committed Aug 20, 2016
    Configuration menu
    Copy the full SHA
    e137bda View commit details
    Browse the repository at this point in the history