Richard Peter
|
d65b11d404
|
Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Former-commit-id: cd51f3fa87 [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: a7ec0bcf66
|
2014-04-11 16:23:09 -05:00 |
|
Dave Hladky
|
7e34763fcd
|
Issue #2789 Implement Version transformations
Change-Id: I00a4fd18c993bf4240ec620d17ab377e8e62cc5c
Former-commit-id: 4fab01e109 [formerly e80005a1c4] [formerly 5064730dfa [formerly 50279c71ad037d462f195c5f785165d2eee26f87]]
Former-commit-id: 5064730dfa
Former-commit-id: ae13afc1c6
|
2014-04-03 09:44:14 -05:00 |
|
Dave Hladky
|
e464a1d8f8
|
Issue #2939 Madis data mismatches
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2
Former-commit-id: 39343e1801 [formerly 3ac04dd071] [formerly 9f3c5dcc42 [formerly 4105db3604440c6c01b99a11fdc0573e6934376c]]
Former-commit-id: 9f3c5dcc42
Former-commit-id: 43cbcff538
|
2014-03-24 08:27:12 -05:00 |
|
Steve Harris
|
c24108e75b
|
Merge branch 'omaha_14.2.1' into development
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 51b755a476 [formerly 873bd6b889] [formerly f60aba35d6 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]
Former-commit-id: f60aba35d6
Former-commit-id: 708485427e
|
2014-03-07 15:43:40 -06:00 |
|
Steve Harris
|
587f15a95d
|
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: 3ba28aabea [formerly 069093884f] [formerly ffcc34f8d4 [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]
Former-commit-id: ffcc34f8d4
Former-commit-id: 96658d8ce0
|
2014-03-06 08:39:43 -06:00 |
|
Dave Hladky
|
dd3501ae41
|
Issue #2713 Update path for MADIS-Harvester.xml
Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788
Former-commit-id: fb2cfff4d2 [formerly 92d677141f] [formerly d40107e530 [formerly f6e63a5d65a5450eb58e59833091b41ef4bf0a3f]]
Former-commit-id: d40107e530
Former-commit-id: 06d41ccafa
|
2014-03-03 08:46:37 -06:00 |
|
Dave Hladky
|
0deff30baa
|
Issue #2731 Fixed calendar conversion issuse with OGC
Change-Id: I78bd0fd36082302bcbc83062671c8d77236cb632
Former-commit-id: 737ed09ade [formerly 973e5ab34b] [formerly 61c5133612 [formerly 9667ac26165431819cddab45ec2e081b6a560da8]]
Former-commit-id: 61c5133612
Former-commit-id: 786f3d1978
|
2014-01-22 15:18:18 -06:00 |
|
Dave Hladky
|
9d136bb7d8
|
Issue #2679 Multiple regions for a single collector mapped to single WFS source
Change-Id: I1e4b1eefe5f507742805886292ba67b24f40f34c
Former-commit-id: eddceed756 [formerly 08625addba] [formerly c57c27c843 [formerly b888d311923ba0628fa015018ef2f62fce47fb43]]
Former-commit-id: c57c27c843
Former-commit-id: 6069bb90c7
|
2014-01-15 10:05:20 -06:00 |
|
Dave Hladky
|
326a5d8776
|
Issue #2351 Fixed bugs in Bandwidth and adhoc pointdata flow
Change-Id: I6510f8bd685033627b4cdfa53c6269aeee21a4d6
Former-commit-id: cedbfc69b7 [formerly f0cd59589b] [formerly 32492e2fc7 [formerly 5013a3b61bcc0a1533211e047d780e5a7ecacb08]]
Former-commit-id: 32492e2fc7
Former-commit-id: 027ab20562
|
2013-09-11 13:28:51 -05:00 |
|
Dave Hladky
|
6ad604217a
|
Issue #2098 Updates to how time is managed in DPA
Former-commit-id: 02ce48bbdc [formerly a6c891ba01] [formerly 24f29f0e55 [formerly 0cd9dc99829d50ef77324b808c662b037b82969c]]
Former-commit-id: 24f29f0e55
Former-commit-id: 6f7e55b18e
|
2013-09-04 12:58:20 -05:00 |
|
Dave Hladky
|
02c9778ff6
|
Issue #2098 Updates for WFS/DPA improvements
Change-Id: Ia0d68d1faf5f4b9da8c8f683f459a1a3e5dac0cf
Former-commit-id: 24a3c8b24b [formerly 0a45c77520] [formerly ac4aeeec45 [formerly dc668631168388501efb8753ecb4cff8b9025456]]
Former-commit-id: ac4aeeec45
Former-commit-id: 36005754b5
|
2013-08-30 12:57:31 -05:00 |
|
Dave Hladky
|
6a1a06e3ee
|
Issue #2097 Initial update for OGC services
Change-Id: I1bc8fc8a4c125bc79057c4af929c0495f0e5eb99
Former-commit-id: d3bae9e065 [formerly 83dba7b655] [formerly bef4b3cdbd [formerly 875006e24de0755cdd0dedc7b0afcf221bcbad49]]
Former-commit-id: bef4b3cdbd
Former-commit-id: 37062aac21
|
2013-08-28 08:24:45 -05:00 |
|