Merge branch 'CLIMATE-917' of https://github.com/MichaelArthurAnderson/climate
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/91c00655 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/91c00655 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/91c00655 Branch: refs/heads/master Commit: 91c00655541a05b7af07e6a837e810e6212c8183 Parents: e63c5f2 13c6dd6 Author: Lewis John McGibbney <lewis.mcgibb...@gmail.com> Authored: Tue Jan 16 18:08:29 2018 -0800 Committer: Lewis John McGibbney <lewis.mcgibb...@gmail.com> Committed: Tue Jan 16 18:08:29 2018 -0800 ---------------------------------------------------------------------- docs/source/conf.py | 9 +++++++++ ocw/dataset.py | 3 ++- ocw/dataset_loader.py | 17 ++++++++--------- ocw/utils.py | 16 ++++++++-------- 4 files changed, 27 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
