Merge branch 'master' of https://github.com/apache/climate into CLIMATE-841
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/036e5fd9 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/036e5fd9 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/036e5fd9 Branch: refs/heads/master Commit: 036e5fd98c6ba038a371deaf670325309318cb6c Parents: ca73376 91ec7f3 Author: huikyole <huiky...@argo.jpl.nasa.gov> Authored: Wed Aug 3 15:52:26 2016 -0700 Committer: huikyole <huiky...@argo.jpl.nasa.gov> Committed: Wed Aug 3 15:52:26 2016 -0700 ---------------------------------------------------------------------- MANIFEST.in | 1 + ocw/dataset.py | 56 +++++++++++++++++++++--------------------- ocw/shape/us_states.dbf | Bin 0 -> 12962 bytes ocw/shape/us_states.shp | Bin 0 -> 222344 bytes ocw/shape/us_states.shx | Bin 0 -> 508 bytes ocw/shape/usa_states.dbf | Bin 12962 -> 0 bytes ocw/shape/usa_states.shp | Bin 222344 -> 0 bytes ocw/shape/usa_states.shx | Bin 508 -> 0 bytes setup.py | 14 ++++++++--- 9 files changed, 40 insertions(+), 31 deletions(-) ----------------------------------------------------------------------
