Skip to content

Conversation

aflaxman
Copy link
Contributor

@aflaxman aflaxman commented Oct 9, 2012

This branch makes inf/-inf different from nan/None (GH #1919), and also fixes a few bugs with INF and NaN values (GH #2026, #2041).

@ghost ghost assigned wesm Nov 18, 2012
@wesm
Copy link
Member

wesm commented Nov 25, 2012

I'll take a crack at merging this soon. Will have to do so tenderly because of all the merge commits =/

@aflaxman
Copy link
Contributor Author

my apologies if I've made this overly complicated. let me know if i can clarify things and what to do differently in the future.

@wesm
Copy link
Member

wesm commented Nov 25, 2012

Generally merging master into a feature branch is discouraged because it makes merging back or cherry-picking messy. Rebasing, if anything at all, tends to be preferable

wesm added a commit that referenced this pull request Dec 2, 2012
wesm added a commit that referenced this pull request Dec 2, 2012
@wesm wesm merged commit c5e3fc1 into pandas-dev:master Dec 2, 2012
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.

2 participants