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

Complete PR 688 (Adding dynamic CDNs for the widgets) #897

Merged
merged 4 commits into from Jun 13, 2018

Conversation

andersonfrailey
Copy link
Contributor

This PR simply resolves the merge conflicts in PR #688 by @hayleefay.

cc @hdoupe

@hdoupe
Copy link
Collaborator

hdoupe commented Jun 13, 2018

Thanks @andersonfrailey. This looks good. Can you change the bokeh version to >=0.12.7 in:

  • conda-requirements.txt
  • distributed/Dockerfile

@andersonfrailey
Copy link
Contributor Author

@hdoupe yep. Added in latest commit.

@hdoupe
Copy link
Collaborator

hdoupe commented Jun 13, 2018

LGTM. Thanks @andersonfrailey

@hdoupe hdoupe merged commit 041bee5 into ospc-org:master Jun 13, 2018
@hdoupe
Copy link
Collaborator

hdoupe commented Jun 13, 2018

Also thanks for opening this @hayleefay. Sorry for letting it sit open for so long.

@hdoupe hdoupe changed the title Complete PR 688 Complete PR 688 (Adding dynamic CDNs for the widgets) Jun 13, 2018
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.

None yet

3 participants