Commit graph

5 commits

Author SHA1 Message Date
Steve Harris
e524aa5148 Merge branch 'omaha_16.1.1' into omaha_16.2.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.climate/src/com/raytheon/uf/common/dataplugin/climate/ClimateGeometryFactory.java


Former-commit-id: 0e4bb5edcd4f05b880e70b3f2c66d70209be11fa
2015-08-27 11:40:53 -05:00
Mark Peters
409baa5ba6 Omaha #4409 Alias geometry column names to make sure all requested columns are unique
Change-Id: Ida92adaf87fae3e082a7ed161ab4725ee5fb0b61

Former-commit-id: 8e593a05b3872e19bd0bbcc35fed8b557a578484
2015-08-21 15:47:45 -05:00
Richard Peter
5d7f17e149 Omaha #4486 - Hibernate return java.util.Date instead of java.sql.Timestamp
Change-Id: Ib425d2f4021a587b5c8cd52bfe3816c723f6b0a1

Former-commit-id: 06d943d51fec264ec34a45ed84547b7972925e7e
2015-08-05 15:19:05 -05:00
Mark Peters
c6845f5f00 Omaha #4409 Fix error with extracting query results in ClimateGeometryFactory.getTimeColumnNames()
Change-Id: I902a5f1f31d01307e728cb05d5181a6876b8eb6c

Former-commit-id: 0048cca04e4c07c2dab5f37e5d224b0f82905d3f
2015-05-21 16:40:30 -05:00
Mark Peters
ddfeb6f71e Omaha #4409 Add support for retrieving climate data through the Data Access Framework
Change-Id: I06d4b48840945a13f24c64c92599d3a7f1718fab

Former-commit-id: 9dab7e6c736bd42c7e69ef41ec55619d6e142914
2015-05-19 13:21:58 -05:00