231 commits

Author	SHA1	Message	Date
Brian.Dyke	aa2b4835e3	Merge branch 'master_14.3.1' into asm_14.3.1 ... Former-commit-id: 175f4e67c1 [formerly d168e371aa [formerly a6d5822b5cb5bb3aa62fcc95e980b08c685a3be3]] Former-commit-id: d168e371aa Former-commit-id: 3459e1fcbc	2014-08-26 15:00:55 -04:00
Roger Ferrel	c7cf1e9273	Issue #3439 Name change per suggestions in email. ... Former-commit-id: f110ca1f3d [formerly fb54b80ed5 [formerly 44c3b86c9dc0b978acc66c5f79255270ce0acb41]] Former-commit-id: fb54b80ed5 Former-commit-id: d76722987e	2014-08-19 16:41:06 -05:00
Roger Ferrel	ea9abeb25e	Issue #3439 Changes to add new GFS data to Product and Volume Browser. ... Change-Id: I6314cb1a99aada35290a52e03810d4d51b224a9d Former-commit-id: 518ec99c00 [formerly eef17da8cd [formerly 658976d6c9485a3abe4d8a5ba759897407ec1239]] Former-commit-id: eef17da8cd Former-commit-id: 2223d9500e	2014-08-13 14:40:13 -05:00
Steve Harris	9c145d8e2e	Merge branch 'master_14.3.1' (14.3.1-14) into omaha_14.3.1 ... Former-commit-id: 7a8cdaea54 [formerly 941efaf857 [formerly f158314a854a081cb12cd15cab3f6340d5c0fb78]] Former-commit-id: 941efaf857 Former-commit-id: 3a10442f6e	2014-08-04 16:04:11 -05:00
Brian.Dyke	770b56e740	Merge branch 'master_14.3.1' into asm_14.3.1 ... Conflicts: cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java Former-commit-id: 7fbb3b6a54 [formerly 6f6daaa249 [formerly f22cc09d0a6fdc7a806726d5207f6b3507972b94]] Former-commit-id: 6f6daaa249 Former-commit-id: 8ea5c4f98b	2014-08-04 16:40:02 -04:00
Brian.Dyke	590e37a8f2	Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1 ... Conflicts: cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.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.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java Former-commit-id: 270d2b0ddb [formerly 9abb02ea8a [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]] Former-commit-id: 9abb02ea8a Former-commit-id: 301f3094be	2014-08-04 13:10:13 -04:00
Ben Steffensmeier	fa3207a140	Issue #3455 Fix gridless grib models. ... Former-commit-id: 12f84a9427 [formerly 7341c62f40 [formerly 1228b73957fc4a407e9075292faffeff3a84bdb4]] Former-commit-id: 7341c62f40 Former-commit-id: 1005d4d4b1	2014-07-30 16:44:07 -05:00
Juliya Dynina	da9c6c35d2	Merge "ASM #15557 - Restore ability to display HPCGuide2.5" into asm_14.2.2 ... Former-commit-id: 8d967f1ecf [formerly ac39f9cb43 [formerly 9826716e2a5f59826e8a3789ca8d2d8f8dc58cce]] Former-commit-id: ac39f9cb43 Former-commit-id: b9cd9042dd	2014-07-11 08:37:30 -05:00
Melissa Porricel	73063fd894	ASM #15557 - Restore ability to display HPCGuide2.5 ... Change-Id: Ibdcdd0aa95e406b5cd886dc8f51e74a3cde54d17 Change-Id: I5594c2151026247d48e657a30c7b4f94b14f036f Former-commit-id: 1f7cf4a165 [formerly d3c29b834d [formerly 5998e7ad9690e3b87805c75dcb711d299e8f1427]] Former-commit-id: d3c29b834d Former-commit-id: 1e5bef6820	2014-07-10 16:15:12 -04:00
Brian.Dyke	31d8874e14	Merge branch 'master_14.3.1' into asm_14.3.1 ... Former-commit-id: 6d93f8f3ef [formerly b64d38be69 [formerly 765d6440b1b19d7b0cf789fb7a873e14b4a679e1]] Former-commit-id: b64d38be69 Former-commit-id: da6b0f2adf	2014-07-01 13:47:12 -04:00
Steve Harris	741dc31fcb	Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1 ... Conflicts: cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5 Former-commit-id: 7acd9ab2dd [formerly d4dc1723c1 [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]] Former-commit-id: d4dc1723c1 Former-commit-id: 2f2958df37	2014-07-01 11:08:46 -04:00
Melissa Porricel	42bf886fda	ASM #524 - Make HPE data decode and display ... Change-Id: I5d29c14efb9f4f1eb2b7794cb571135679861d4e Former-commit-id: 1e00e87918 [formerly 7b44a4a1a0 [formerly 6fe015e2bfedfc52c210c1c84e72a67a1d790ca9]] Former-commit-id: 7b44a4a1a0 Former-commit-id: 2835b685a3	2014-06-16 15:38:37 -04:00
Brian.Dyke	7056d79f70	Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2 ... Conflicts: edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py Former-commit-id: 9ab17ddecb [formerly f72380ad60 [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]] Former-commit-id: f72380ad60 Former-commit-id: 0f07e14bf1	2014-06-10 13:56:03 -04:00
Stephen Gilbert	bb2323b792	VLab Issue #3648 - Corrected NCEP additions for ESTOFS model ... Change-Id: I0824e9ebabb4cd0884f202899321f2a05198627b Former-commit-id: d49482965e [formerly b7d93ed06d [formerly c681ba369a486f3ff3c7a324837a78e9c5594b4b]] Former-commit-id: b7d93ed06d Former-commit-id: 11cf39ce44	2014-06-05 12:06:35 -04:00
Kenneth Sperow	764ffeb440	Merge remote branch 'origin/master_14.3.1' into field_14.3.1. Merge up to dec7b6fa ... Conflicts: edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml Change-Id: I9d39ab71514eaf81d6c841dc7358bcc92f46ddd8 Former-commit-id: f2a738cc25 [formerly c302ef8967 [formerly b0e1387ccf5f7b12b83c3adbb6c873cca9a7d2a5]] Former-commit-id: c302ef8967 Former-commit-id: a59743ebe0	2014-06-03 20:55:29 -07:00
Steve Harris	08308cd279	Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1 ... Conflicts: cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java 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.grid/localization/volumebrowser/FieldDisplayTypes.xml cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.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 cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66 Former-commit-id: 3b16bbafb1 [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]] Former-commit-id: 99bc6f990c Former-commit-id: 3de24b7b07	2014-05-27 14:48:24 -04:00
Kenneth Sperow	5e3a370777	Merge remote branch 'origin/master_14.3.1' into field_14.3.1_merge Merge up to 30173aa114 [formerly 476c78a2d7] [formerly 189e3cc1f2] [formerly 342398e6a3 [formerly 189e3cc1f2 [formerly ddeadcf968d945a322e8a9c8a8d25753782887f0]]] ... Conflicts: edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml Change-Id: I2005791595cbb8303d385ed4c397e1997e7ce38f Former-commit-id: 9fa9425aea [formerly 8490f7ea33 [formerly 41ee30cbe04bb6cba695f7480d6b1492aec4219c]] Former-commit-id: 8490f7ea33 Former-commit-id: 6f8b069dbe	2014-05-22 14:16:49 -07:00
Stephen Gilbert	834c0bf1bb	Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1 ... Former-commit-id: e73836f3b5 [formerly 8a3ab16e46 [formerly d2d54ee2bfbbe6fef44df58d2edc3b5858ffbe22]] Former-commit-id: 8a3ab16e46 Former-commit-id: 651f6a2e9c	2014-05-22 13:31:12 -04:00
Stephen Gilbert	94a1a64ef0	Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1 ... Conflicts: ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml Change-Id: Id609c4bd0e120f357b15c8a859ec0ece54ed47e0 Former-commit-id: 7992a6b15b [formerly 91d469eb90 [formerly 42eab5bcfeae6a2e1db32b83a68249bb37c9584e]] Former-commit-id: 91d469eb90 Former-commit-id: 14258764bd	2014-05-22 12:39:09 -04:00
brian.dyke	4d161aaf90	Merge branch 'master_14.3.1-4' into asm_14.3.1 ... Conflicts: cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml Former-commit-id: 58683ad040 [formerly 011d121e4b [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]] Former-commit-id: 011d121e4b Former-commit-id: 9626317825	2014-05-19 09:45:37 -04:00
Stephen Gilbert	80c8dae07c	VLab Issue #3720 - NCEP EDEX and EDEX Common delivery for 14.3.1 ... Table updates for GRIB decoding; Updates to gpd, mcidas, pafm, and pgen plugins Change-Id: Ic6874210998d7f5a6b164ef45c6918246388ee68 Former-commit-id: ca9b7c8dfc [formerly bd2dad11b5 [formerly 3c904361e7176592cc873a3414c18ad5107aea54]] Former-commit-id: bd2dad11b5 Former-commit-id: 4602f86f47	2014-05-15 17:20:52 -04:00
Ana Rivera	49512f29bf	VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648 ... Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1 Former-commit-id: 81a9d4fa44 [formerly 91715e7a3f [formerly e71ef5db23122405fc6aab71526a9cc3ec3ad823]] Former-commit-id: 91715e7a3f Former-commit-id: 7e74e047a0	2014-05-12 18:55:06 +00:00
Brian.Dyke	82ce970ad6	CM-MERGE:OB13.5.5-5 into 14.1.2 ... Former-commit-id: 41ba5fc348 [formerly 386ec058e1 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]] Former-commit-id: 386ec058e1 Former-commit-id: 3aa2f7974b	2014-05-12 14:07:11 -04:00
Ana Rivera	a5a849f2a0	VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data ... Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b Former-commit-id: 1b4450ec5f [formerly aac45623bc [formerly c5a4f22a24b6c1eced689c6ae437558a9a6cbc9e]] Former-commit-id: aac45623bc Former-commit-id: e7fbea035f	2014-05-08 20:10:24 +00:00
Melissa Porricel	1adfd7ea51	ASM #481 - Add Guam GFSDNG to AWIPS ... Change-Id: Iebf45e4b94fcf25aa32554f4363d0dc25f3e47ca Former-commit-id: 92231e051d [formerly 42c36a5e80 [formerly 012fa438f085498027402c1cd0897dd13c0d4edc]] Former-commit-id: 42c36a5e80 Former-commit-id: a91a4ed137	2014-05-05 14:56:58 -04:00
Steve Harris	010301045d	Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22) ... Conflicts: cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml Former-commit-id: 1c8f2f6185 [formerly 6ef3b9f1e5 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]] Former-commit-id: 6ef3b9f1e5 Former-commit-id: 9e149df799	2014-05-05 08:21:02 -05:00
Richard Peter	8b1a177110	Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1 ... Conflicts: cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900 Former-commit-id: 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]] Former-commit-id: 44b1782461 Former-commit-id: 67683dd891	2014-04-28 16:27:40 -05:00
Ben Steffensmeier	1718bc0c82	Issue #3084 Fix NXxNY in master_grib2_lookup, update and comment master_grib2_lookup entries. ... Former-commit-id: 9985f518b1 [formerly 25e4eee58a [formerly b75445ffea12040487d57bdf248ff3fd48877d8d]] Former-commit-id: 25e4eee58a Former-commit-id: 3601d1ff98	2014-04-28 16:26:04 -05:00
Ben Steffensmeier	214311cc6e	Issue #2874 Allow RTOFS nowcast to be identified by process type. ... Former-commit-id: fa3d4bb618 [formerly 2d96d9d2df [formerly 1e430dd1227f2e368a7da21d116677a3b522d5ed]] Former-commit-id: 2d96d9d2df Former-commit-id: 9478f8adc9	2014-04-25 14:38:36 -05:00
Nate Jensen	df22d06b21	Merge "Issue #2060 remove FFG post processor dependency on dataURI, other minor cleanups" into development ... Former-commit-id: 0a245df4f1 [formerly cf6992073f [formerly 5b4555f7e94bf952b6e2323685e53e4708a8039b]] Former-commit-id: cf6992073f Former-commit-id: 64a09dbdc6	2014-04-25 13:26:10 -05:00
Nate Jensen	a9f16fe45f	Issue #2060 remove FFG post processor dependency on dataURI, other minor ... cleanups Change-Id: I4c572c3f7d2bef1bdd0b9a596f916e29f8e53410 Former-commit-id: 74b3181107 [formerly 7da49c00f5 [formerly b45cdd1a3f4742937b9085ca70d538ae724d6aab]] Former-commit-id: 7da49c00f5 Former-commit-id: d9ad750a99	2014-04-25 12:19:23 -05:00
David Gillingham	777456404b	Issue #2897: Add support for Multi-grid Hurricane Wave Models to D2D and GFE. ... Change-Id: I66e609d17afcfc900ceaf1b1eed328320d022fbb Former-commit-id: 6ca193b8e9 [formerly 2426e463f7 [formerly 33197dc6708b65e85233b51be1e99e6411ece60f]] Former-commit-id: 2426e463f7 Former-commit-id: c14497b1b7	2014-04-25 10:56:43 -05:00
Brian.Dyke	362d882b40	Merge branch 'master_14.2.2' into master_14.3.1 ... Merge (14.2.2-5 into 14.3.1-1) Conflicts: cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java Former-commit-id: 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]] Former-commit-id: fb1f5aa593 Former-commit-id: f0b8ea5822	2014-04-25 11:06:11 -04:00
Nate Jensen	03451ab6b2	Issue #2060 dropping grid dataURI column ... Change-Id: I8b8ba3f2ec71e15aa3c40e7eab42525dbf09157e Former-commit-id: 5dfb652775 [formerly a37a2afe18 [formerly 1aab87d9572089a09351ebdfb8fbcef884866feb]] Former-commit-id: a37a2afe18 Former-commit-id: 263611f905	2014-04-21 17:34:39 -05:00
Brian.Dyke	9075808d0a	Merged 13.5.5-1 into 1412 ... Former-commit-id: 35ad867281 [formerly 188d84cc87 [formerly f44629e87a6401a5b872c050b9cf79defd306171]] Former-commit-id: 188d84cc87 Former-commit-id: 65ad515a6e	2014-04-16 12:09:12 -04:00
Richard Peter	909571ebca	Issue #2726: Edex graceful shutdown. ... Refactored to use inheritance and separate logic where possible. Addressed comments. Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6 Former-commit-id: 17196b5dcd [formerly dbba727f3d [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]] Former-commit-id: dbba727f3d Former-commit-id: e4be1f24e7	2014-04-14 13:10:11 -05:00
Ben Steffensmeier	dae20b905a	Issue #2874 RTOFS temperature unit correction and style enhancements ... Former-commit-id: 3baaf6543d [formerly a846430a84 [formerly 129dff2511c50abe9367e233fb64b5ca923db258]] Former-commit-id: a846430a84 Former-commit-id: f2c605f6d3	2014-04-03 16:42:45 -05:00
Richard Peter	9536a08425	Issue #2509: Fix stitched grid notifications ... Change-Id: Ib4581f8c8d3f3eae15d22601cfc35732acd849a4 Former-commit-id: f99875040c [formerly 53d5000261 [formerly 861f0c09baa01e191b430bce6699c0f1c95a52d2]] Former-commit-id: 53d5000261 Former-commit-id: bfba75f73f	2014-04-01 14:44:05 -05:00
Ben Steffensmeier	9e2e500040	Issue #2874 Initial implementation of RTOFS data. ... Former-commit-id: 12ed72b0c0 [formerly 55046a8e1e [formerly 11837e612778ea7a1d42fbfac1e0e2b3d3678f1c]] Former-commit-id: 55046a8e1e Former-commit-id: 1c18e800b3	2014-03-24 11:10:18 -05:00
Steve Harris	865fef97b1	Merge branch 'omaha_14.2.1' into development ... Conflicts: edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml Former-commit-id: f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]] Former-commit-id: 873bd6b889 Former-commit-id: 51b755a476	2014-03-07 15:43:40 -06:00
Steve Harris	52226061e9	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: ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]] Former-commit-id: 069093884f Former-commit-id: 3ba28aabea	2014-03-06 08:39:43 -06:00
Richard Peter	79d3aa4e1a	Merge branch 'omaha_14.2.1' (14.2.1-8) into development ... Conflicts: cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75 Former-commit-id: 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]] Former-commit-id: 0e25ae35c1 Former-commit-id: 7bd6a07913	2014-02-27 15:18:26 -06:00
Brian.Dyke	3508e488f5	OB_14.1.1-19 baseline ... Former-commit-id: 10b723647b [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]] Former-commit-id: cfa4997978 Former-commit-id: 779553142c	2014-02-21 06:50:59 -05:00
Ben Steffensmeier	89d47e3243	Issue #2765 Fix aliases for probability parameters. ... Former-commit-id: 0bb18f2cd7 [formerly 43a8b80ef2 [formerly 11bbfb8275cfafb411d1d5d9732b021f0011712a]] Former-commit-id: 43a8b80ef2 Former-commit-id: 2952ae37a6	2014-02-11 11:35:03 -06:00
Steve Harris	f1a9ec2d1e	Merge branch 'omaha_14.2.1' into development ... Conflicts: ncep/gov.noaa.nws.ncep.viz.ui.perspectives/plugin.xml Former-commit-id: 7b59bd41eb [formerly 7a156e297a [formerly debbd62a40cf8d27b1990d1b06f273d09dd9a981]] Former-commit-id: 7a156e297a Former-commit-id: ae2b849157	2014-02-03 10:29:16 -06:00
Stephen Gilbert	e64020e271	VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1 ... Updates to GRIB decoder tables. Changes to some decoder plugins to support data ingest through qpid. Change-Id: Id42e993b1ac76040ad19c970c43036d3f852def0 Former-commit-id: 2bd1588ad4 [formerly a12b83ddfb [formerly f64ce96da2871e55b40b6fe4ba0e77eaed266103]] Former-commit-id: a12b83ddfb Former-commit-id: 185f06495f	2014-01-24 10:14:17 -05:00
Max Schenkelberg	30059d255c	Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins. ... Amend: Changed version numbers per discussion Amend: Actually added changed files to the index Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5 Former-commit-id: cc2080449c [formerly 16046a4dde [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]] Former-commit-id: 16046a4dde Former-commit-id: b3aed99142	2014-01-06 17:03:45 -06:00
Richard Peter	ed79e93d00	Issue #2170: Fix Ensemble notifications ... Change-Id: I48cdd8dad18f0e4866f2e150acb37c8f6ada139b Former-commit-id: 0c269d0a7c [formerly b3f90b4e07 [formerly da7c2ba0cdc0e9108d987d9ff7531f657c7c832e]] Former-commit-id: b3f90b4e07 Former-commit-id: 0c5a6af2f3	2013-12-06 15:41:10 -06:00
Richard Peter	ba577ff354	Merge branch 'omaha_14.1.1' (14.1.1-11) into development ... Conflicts: cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a Former-commit-id: a0b6ea8bb2 [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]] Former-commit-id: 0c4ae068ad Former-commit-id: b3b23647b4	2013-12-05 12:12:27 -06:00
Richard Peter	f2d99af20e	Issue #2170: Update Plugin Notification Framework ... Change-Id: I2ec99fadbe2f383bb0892c59601350395f1e5277 Former-commit-id: fbda83aeb9 [formerly 2085a9cd33 [formerly 081a19d5cfca3d717a332357dbaead199767e0b8]] Former-commit-id: 2085a9cd33 Former-commit-id: 5905c5d08d	2013-12-03 11:41:21 -06:00