Merge branch 'CLIMATE-825'
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/577dfb78 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/577dfb78 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/577dfb78 Branch: refs/heads/CLIMATE-825 Commit: 577dfb78704a340b187ee746bef15b91a1fb5414 Parents: 70cd2b5 541dbe5 Author: Alex Goodman <ago...@users.noreply.github.com> Authored: Fri Jul 29 08:20:33 2016 -0700 Committer: Alex Goodman <ago...@users.noreply.github.com> Committed: Fri Jul 29 08:20:33 2016 -0700 ---------------------------------------------------------------------- docs/source/index.rst | 2 +- docs/source/ocw/dataset_loader.rst | 5 + ocw/dataset_loader.py | 206 ++++++++++++++++++++++++++++++++ ocw/tests/test_dataset_loader.py | 185 ++++++++++++++++++++++++++++ 4 files changed, 397 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
