Merge branch 'CLIMATE-769'

Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/fba1ce63
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/fba1ce63
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/fba1ce63

Branch: refs/heads/master
Commit: fba1ce638eeacd73b60f46e1ce3c8f96afc4466d
Parents: 9deb819 39960b5
Author: Omkar20895 <omkarreddy2...@gmail.com>
Authored: Sat Aug 27 09:11:24 2016 +0530
Committer: Omkar20895 <omkarreddy2...@gmail.com>
Committed: Sat Aug 27 09:11:24 2016 +0530

----------------------------------------------------------------------
 docs/source/data_source/data_sources.rst |   5 ++
 easy-ocw/ocw-pip-dependencies.txt        |   1 +
 examples/podaac_integration_example.py   |  75 +++++++++++++++++
 ocw/data_source/podaac_datasource.py     | 111 ++++++++++++++++++++++++++
 ocw/dataset_loader.py                    |   6 +-
 ocw/tests/test_podaac.py                 |  66 +++++++++++++++
 6 files changed, 263 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


Reply via email to