Merge branch 'CLIMATE-818' of https://github.com/agoodm/climate into CLIMATE-818
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/a57eb4d9 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/a57eb4d9 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/a57eb4d9 Branch: refs/heads/master Commit: a57eb4d9be3f115c72348d4cd932f20e66611d73 Parents: 9e1138d 009daf6 Author: Alex Goodman <ago...@users.noreply.github.com> Authored: Tue Jun 28 01:03:14 2016 -0700 Committer: Alex Goodman <ago...@users.noreply.github.com> Committed: Tue Jun 28 01:03:14 2016 -0700 ---------------------------------------------------------------------- ocw/data_source/local.py | 44 ++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
