Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/climate
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/281f4211 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/281f4211 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/281f4211 Branch: refs/heads/master Commit: 281f4211fcd96a03b6950d3a1940286ff5e79c9c Parents: 98777d6 4743021 Author: huikyole <[email protected]> Authored: Thu Jan 28 15:43:49 2016 -0800 Committer: huikyole <[email protected]> Committed: Thu Jan 28 15:43:49 2016 -0800 ---------------------------------------------------------------------- .../frontend/app/scripts/controllers/observationselect.js | 10 ++++++++-- ocw-ui/frontend/app/views/selectobservation.html | 8 ++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
