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/7ab01410 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/7ab01410 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/7ab01410 Branch: refs/heads/master Commit: 7ab0141061b9a11638452e8e60c3400a92057390 Parents: 70cd2b5 fa8356c Author: Alex Goodman <[email protected]> Authored: Fri Jul 29 11:31:12 2016 -0700 Committer: Alex Goodman <[email protected]> Committed: Fri Jul 29 11:31:12 2016 -0700 ---------------------------------------------------------------------- docs/source/index.rst | 2 +- docs/source/ocw/dataset_loader.rst | 5 + ocw/dataset_loader.py | 207 ++++++++++++++++++++++++++++++++ ocw/tests/test_dataset_loader.py | 185 ++++++++++++++++++++++++++++ 4 files changed, 398 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
