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

Mergeback 2.2.x #3256

Merged
merged 2 commits into from
Feb 1, 2019
Merged

Mergeback 2.2.x #3256

merged 2 commits into from
Feb 1, 2019

Conversation

pp-mo
Copy link
Member

@pp-mo pp-mo commented Feb 1, 2019

Brings #3247 to master

@pp-mo pp-mo requested a review from bjlittle February 1, 2019 11:05
@bjlittle bjlittle self-assigned this Feb 1, 2019
@bjlittle bjlittle added this to the v2.3.0 milestone Feb 1, 2019
@bjlittle
Copy link
Member

bjlittle commented Feb 1, 2019

@pp-mo LGTM, thanks for doing this... once travis-ci is happy, then so am I 👍

@pp-mo
Copy link
Member Author

pp-mo commented Feb 1, 2019

Now waiting on #3257, to fix v2.2.x (!)
ping @bjlittle

@bjlittle
Copy link
Member

bjlittle commented Feb 1, 2019

@pp-mo Just merged #3257 to unblock you... time to rebase, and we'll take it from there 😄

@pp-mo
Copy link
Member Author

pp-mo commented Feb 1, 2019

ping @bjlittle all good !

@bjlittle bjlittle merged commit 6a4f9dc into master Feb 1, 2019
@bjlittle
Copy link
Member

bjlittle commented Feb 1, 2019

@pp-mo Awesome, thanks! 😄

znicholls pushed a commit to znicholls/iris that referenced this pull request Jun 15, 2019
* BLD: Pinning cftime to 1.0.1 (SciTools#3247)

* Fix for numpy 1v16. (SciTools#3257)
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.

2 participants