Merge branch 'CLIMATE-316' 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/5058b389 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/5058b389 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/5058b389 Branch: refs/heads/master Commit: 5058b38985a81e338817f9b52d251fe342b3928c Parents: 513dcc4 848cdb6 Author: Lewis John McGibbney <lewis.mcgibb...@gmail.com> Authored: Tue Mar 13 10:13:48 2018 -0700 Committer: Lewis John McGibbney <lewis.mcgibb...@gmail.com> Committed: Tue Mar 13 10:13:48 2018 -0700 ---------------------------------------------------------------------- examples/esgf_integration_example.py | 58 +++++++++++-------- ocw/data_source/esgf.py | 66 ++++++++++----------- ocw/esgf/constants.py | 2 +- ocw/esgf/download.py | 53 ++++++++++------- ocw/esgf/logon.py | 16 +++--- ocw/esgf/main.py | 96 ++++++++++++++++--------------- ocw/esgf/search.py | 22 ++++--- 7 files changed, 171 insertions(+), 142 deletions(-) ----------------------------------------------------------------------