Skip to content

REV: Undo bad rebase in 7fdfdd6a52fc0761c0d45931247c5ed2480224eb (#8981)#10017

Merged
charris merged 1 commit intonumpy:masterfrom
eric-wieser:revert-8981-rebase
Nov 13, 2017
Merged

REV: Undo bad rebase in 7fdfdd6a52fc0761c0d45931247c5ed2480224eb (#8981)#10017
charris merged 1 commit intonumpy:masterfrom
eric-wieser:revert-8981-rebase

Conversation

@eric-wieser
Copy link
Member

That rebase totally lost #9667

This restores the changes in numpygh-9667 that were overwritten.
@eric-wieser eric-wieser added this to the 1.14.0 release milestone Nov 13, 2017
@charris charris merged commit e06ec34 into numpy:master Nov 13, 2017
@charris
Copy link
Member

charris commented Nov 13, 2017

Thanks for catching that, I wonder how it happened?

@ahaldane
Copy link
Member

Strange, I didn't notice anything unusual during the rebase.

@ahaldane
Copy link
Member

Oh yeah, I think I did do something related to shape_base.py, even though I don't see it in the reflog. Sorry, I must have gotten confused by something.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants