152 commits

Author	SHA1	Message	Date
Nate Jensen	d2156230f3	Omaha #3676 harden numpy array to java array conversions to work with ... newer versions of python/numpy and not crash when heap cannot be allocated Change-Id: I2a83f6e2720de331188ae5b42dd8c86b14900288 Former-commit-id: 852fe79de3 [formerly 433e8b6fc1] [formerly b23d42f561 [formerly 67630fce01ecbd64a760211820af5b5eaff4cade]] Former-commit-id: b23d42f561 Former-commit-id: 0a42a053af	2014-10-15 09:02:07 -05:00
Steve Harris	d1c57e9e29	Omaha #3300 - Added another compiled nativeLib binary to finish the Merge tag 'OB_14.3.1-19m' into omaha_14.4.1 ... Former-commit-id: 9891be174d [formerly e09f3ab040] [formerly 6cf62253a8 [formerly 230f4413d69d25ca4e8cafc23ec80b3bb79fea63]] Former-commit-id: 6cf62253a8 Former-commit-id: 653369048a	2014-09-23 15:30:55 -05:00
Steve Harris	a2e1cdf346	Omaha #3300 - Added compiled nativeLib binaries to finish the Merge tag 'OB_14.3.1-19m' into omaha_14.4.1 ... Former-commit-id: f29bef4f34 [formerly 26155d4251] [formerly c8bee38fc7 [formerly 785a6cb7ef5856e0bc0beb3fcf5657f74934111b]] Former-commit-id: c8bee38fc7 Former-commit-id: 3cca5caf09	2014-09-23 12:02:08 -05:00
Steve Harris	e5f8a8f74f	Merge tag 'OB_14.3.1-19m' into omaha_14.4.1 ... Conflicts: cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java Former-commit-id: 2e2072a963 [formerly 7692e3f21d] [formerly b979960b7b [formerly 72f387d2802c12eedfe5643616fe5a54420aef66]] Former-commit-id: b979960b7b Former-commit-id: 50d6dccd09	2014-09-23 11:41:10 -05:00
Brian.Dyke	75284bdd1b	VLab Issue #4015 - MPE - This is the MPEFieldgen LSATPRE Field generation fix. Built library.ohd.pproc.so ... Former-commit-id: 9d2eaef5e7 [formerly 546b43dff6] [formerly 05145d2f0d [formerly 0448deecda7c53ac65bc66bc9751ec0e7f83eee1]] Former-commit-id: 05145d2f0d Former-commit-id: 60a61086d5	2014-09-17 15:39:57 -04:00
Chip Gobs	ab57f9a631	Merge remote-tracking branch 'origin/master_14.3.1' into ohd_14.3.1_v6 ... Former-commit-id: bc743b7bd7 [formerly 0278dfb45f] [formerly 51f2d9df8e [formerly 2131a59fecbb9bc01dd395360f7f8dafe6d76b0b]] Former-commit-id: 51f2d9df8e Former-commit-id: 4ca70c7f7e	2014-09-03 14:48:29 -04:00
Steve Harris	66b485c000	Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1 ... Conflicts: cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java edexOsgi/com.raytheon.uf.tools.cli/impl/capture ldm/src/pqact/pqact.c Former-commit-id: bddf9c0f27 [formerly 793064063b] [formerly 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]] Former-commit-id: 5d58625abc Former-commit-id: d984dd538f	2014-08-29 10:17:52 -05:00
Brian.Dyke	f90649d7e7	Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1 ... Conflicts: cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java Former-commit-id: a08db8d73d [formerly e654318431] [formerly aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]] Former-commit-id: aa83bf804f Former-commit-id: f7f16ff9eb	2014-08-27 11:19:19 -04:00
Brian.Dyke	c8e9153884	Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4 ... Conflicts: edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py Former-commit-id: 2ddc920a4a [formerly 325887e605] [formerly dd9d7133d9 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]] Former-commit-id: dd9d7133d9 Former-commit-id: 1839b614df	2014-08-22 14:16:22 -04:00
Slav Korolev	d080af879e	Issue #2875 - Implemented HFR Surface Current Velocity. ... Change-Id: I586e6aa4064df538b0dcb7012f7c26ce529e4761 This reverts commit fe4b0de79bdc9f7d9251320f16b6046314117f1f [formerly e5af41fa86] [formerly 55a1120bdb [formerly dd9d117f90] [formerly e5af41fa86 [formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f]]]. Conflicts: cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml Former-commit-id: 1c896cedab [formerly a9bed4c6fd] [formerly a779c786f1 [formerly aee044437492438381db98cc6fd3a917f6c05659]] Former-commit-id: a779c786f1 Former-commit-id: 407be3d26f	2014-08-19 10:12:36 -05:00
Loubna.Bousaidi	d9be7127bc	ASM #511 changes to transmit_rfc_bias calls from MPE ... Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004 Former-commit-id: afae4700a6 [formerly 8c15d1f124] [formerly d41e489ced [formerly a43ad03838d53d3b9688b48851f41a1af6b043f6]] Former-commit-id: d41e489ced Former-commit-id: 5cc9b08890	2014-08-15 10:54:10 -05:00
Steve Harris	8c5cbf7224	Issue #3507 - Revert "Issue #2875 - Implemented HFR Surface Current Velocity." ... This reverts commit 5a3f760b6f51d0561dd605388e6b025ebe70e330 [formerly 7ae3ca0bfc] [formerly 50e93daab7 [formerly 978349e517] [formerly 7ae3ca0bfc [formerly f2788ef1881d66467b5aa200b849b6fcf4608b21]]]. Former-commit-id: 55a1120bdb [formerly dd9d117f90] [formerly e5af41fa86 [formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f]] Former-commit-id: e5af41fa86 Former-commit-id: 0739666ae9	2014-08-12 10:19:12 -05:00
Slav Korolev	4ef0572c2d	Issue #2875 - Implemented HFR Surface Current Velocity. ... Former-commit-id: 50e93daab7 [formerly 978349e517] [formerly 7ae3ca0bfc [formerly f2788ef1881d66467b5aa200b849b6fcf4608b21]] Former-commit-id: 7ae3ca0bfc Former-commit-id: 14cf56ec46	2014-08-12 09:19:22 -04:00
Richard Peter	fbb7094b60	Issue #3458 Increase ldm to edexBridge shared memory queue. ... Change-Id: I30f0db8b3802c13048587067fbf901c5a7903468 Former-commit-id: 01692edc6b [formerly bd2d97dc46] [formerly 8374869379 [formerly 21a63b7e1218efedab86d6034dd5b92810764cb9]] Former-commit-id: 8374869379 Former-commit-id: e155de7bbc	2014-08-06 10:57:31 -05:00
Steve Harris	b848e05aa1	Merge branch 'omaha_14.3.1' into omaha_14.4.1 ... Conflicts: cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalesManager.java cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmDisplayWindow.java cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/LocalizationStreamHandler.java edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py Former-commit-id: a92dc418c6 [formerly 0fb743ec44] [formerly bf9a0fa5de [formerly f7d474895366eb23ae5eef242a4568f911435aa3]] Former-commit-id: bf9a0fa5de Former-commit-id: 46fe792d83	2014-08-04 22:20:29 -05:00
Brian.Dyke	bbe6ec4d50	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: 301f3094be [formerly 9abb02ea8a] [formerly 270d2b0ddb [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]] Former-commit-id: 270d2b0ddb Former-commit-id: 37aacfcb96	2014-08-04 13:10:13 -04:00
Ying-Lian.Shi	ef8ec0cff0	ASM #15649 - these 5 files are rolled back to 14.1.3 ... Change-Id: Ifc52168f1faf3984f2a2d72947273686c5a00fd9 Former-commit-id: 9dbfbbe0c3 [formerly 22d46f2658] [formerly 1f6d24a076 [formerly ab5a6807a591605e230d4180f1dcf3c2eaa8657f]] Former-commit-id: 1f6d24a076 Former-commit-id: c571da3e89	2014-07-23 12:24:22 +00:00
Benjamin Phillippe	5eea012728	Omaha #3379 Removing DWR ... Former-commit-id: cc9e9b427a [formerly d110e8428b] [formerly 4e1d93abf8 [formerly a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e]] Former-commit-id: 4e1d93abf8 Former-commit-id: 06e73cd55f	2014-07-11 11:56:44 -05:00
Greg Armendariz	68846930ee	Omaha #3299 - Remove project file and change build reference ... Former-commit-id: 20f5ccf9f0 [formerly f4063c8162] [formerly 40ad6795df [formerly c233ad285b9addca8a8be6074b1e2440896d2276]] Former-commit-id: 40ad6795df Former-commit-id: 44b448738c	2014-06-30 14:49:24 -05:00
Chip Gobs	eca77a2512	VLab Issue #4015 - MPE - This is the MPEFieldgen LSATPRE Field generation fix. ... Change-Id: I950192bc25dd1be78cf77e58f18946c86ac38623 Former-commit-id: 382c7c4edd [formerly 0e64ccc33a] [formerly 83a5ed0e92 [formerly a948c8cc9ffdd19c26cee8c547984aec114e4221]] Former-commit-id: 83a5ed0e92 Former-commit-id: 1ac4dce21d	2014-06-26 06:47:45 -04:00
Steve Harris	d7cd0ac02c	Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1 ... Conflicts: cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java Former-commit-id: 97843cf58e [formerly 9213369739] [formerly e1c8ad2611 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]] Former-commit-id: e1c8ad2611 Former-commit-id: 362988b9d7	2014-06-16 08:19:12 -05:00
Bryan Kowal	692673ade3	Omaha #3189 - ensure the PostgreSQL libpq libraries are included in the hydroapps native directory ... Former-commit-id: 1920bf461d [formerly 03d2a8ab7e] [formerly 8896dc8a75 [formerly 1da5e7cb5f6d8a6b8e915a8ecb238a0825991afe]] Former-commit-id: 8896dc8a75 Former-commit-id: 22d4631b55	2014-06-09 16:20:01 -05:00
Chip Gobs	8edb6c28d8	VLab Issue #3454 OHD changes to help with building. Also added a missing .project file to allow the project to appear in Eclipse. ... Change-Id: I096cc2e9c60a5aa26662e5fccc6692c3ce4f875d Former-commit-id: a5c4402f34 [formerly 83ac596f9e] [formerly 036d1c4d31 [formerly 6944361d04e7462f768bb74f00780dc8b8a51225]] Former-commit-id: 036d1c4d31 Former-commit-id: 6fd88e5422	2014-06-05 13:37:02 -04:00
Steve Harris	373c816e6a	Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1 ... Conflicts: cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java edexOsgi/build.edex/edex/common.properties edexOsgi/build.edex/esb/conf/modes.xml nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so Former-commit-id: 647cd97e29 [formerly 7fec0d039c] [formerly 455eb8b39d [formerly 45250149681f057cf168f4d3cb27276279f62c05]] Former-commit-id: 455eb8b39d Former-commit-id: ec743199f1	2014-06-02 11:21:46 -05:00
Brian.Dyke	3961c75ecd	Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 ... VLab Issue #3454 - HPE dual-polarization upgrade Conflicts: cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults Former-commit-id: a0a879be7d [formerly a8737e18f0] [formerly 3f1e12effc [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]] Former-commit-id: 3f1e12effc Former-commit-id: 66aacd6578	2014-05-30 10:46:25 -04:00
Steve Harris	0e9d0b2ef5	Merge branch 'omaha_14.3.1' (14.3.1-7) into omaha_14.4.1 ... Conflicts: cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/AbstractGLImagingExtension.java cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/StatusStore.java cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/UrgentMessagesDialog.java edexOsgi/build.edex/esb/conf/modes.xml edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/SHEFParser.java edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ShefSeparator.java edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/library/DerivedParameterGenerator.java edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CapeStk.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/Wind.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/uStk.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/vStk.xml edexOsgi/com.raytheon.uf.common.wxmath/src/com/raytheon/uf/common/wxmath/TempOfTe.java Former-commit-id: 718c78d984 [formerly be80bd01f3] [formerly dc74953978 [formerly 802843fa475654ffab03545a4970f4e5857590cd]] Former-commit-id: dc74953978 Former-commit-id: 713cfeffc7	2014-05-28 09:01:00 -05:00
Steve Harris	bfa4255eea	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: 3de24b7b07 [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]] Former-commit-id: 3b16bbafb1 Former-commit-id: 9b98b41cd4	2014-05-27 14:48:24 -04:00
Bryan Kowal	1e983fbf3f	Omaha #3198 - update the Java used by hydro / mpe NativeLib to match the baseline AWIPS II version. ... Rebased on re-compiled on the latest version of the nativeLib code. Former-commit-id: 7341d90341 [formerly f1258ef865] [formerly c711ab9195 [formerly b96b174d5b4b082dc692e3a14ef1cc7b58f06b5a]] Former-commit-id: c711ab9195 Former-commit-id: e387f50206	2014-05-27 13:16:37 -05:00
Steve Harris	1dfc15a77e	Merge branch 'omaha_14.3.1' into omaha_14.4.1 ... Conflicts: cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java cots/org.geotools/.classpath cots/org.geotools/META-INF/MANIFEST.MF cots/org.geotools/build.properties edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/RH.xml edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/level/Level.java edexOsgi/com.raytheon.uf.common.topo/src/com/raytheon/uf/common/topo/TopoQuery.java edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java Former-commit-id: 376482d3b1 [formerly 518822ed83] [formerly b6af2db9f5 [formerly f8cb49d46f88b801a682a34a3b7056bde1ab2569]] Former-commit-id: b6af2db9f5 Former-commit-id: 14b1ea307f	2014-05-22 14:31:06 -05:00
Bryan Kowal	5f438c4a08	Omaha #3189 - update the PostgreSQL used by hydro / mpe NativeLib to match the baseline AWIPS II version. ... amend: remove debug code Change-Id: I16d16576af71ad02821c8e65c10081bda5d061e3 Former-commit-id: 5ca6dfbf90 [formerly c6518e7378] [formerly 76cd1c2ac8 [formerly 9ad4422eb9911f8fbf0c5db40103ee8a1d925570]] Former-commit-id: 76cd1c2ac8 Former-commit-id: b6baecf271	2014-05-20 11:02:31 -05:00
brian.dyke	2e105c1d5d	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: 9626317825 [formerly 011d121e4b] [formerly 58683ad040 [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]] Former-commit-id: 58683ad040 Former-commit-id: bc4649765a	2014-05-19 09:45:37 -04:00
Mike Duff	f49192936a	Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays ... Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13 Former-commit-id: 0456fd0597 [formerly 8498235fd8] [formerly 6a67638a94 [formerly 57755db0d6d77f32d64b4b569bb0af88002a23da]] Former-commit-id: 6a67638a94 Former-commit-id: 70c8135fde	2014-05-08 14:36:54 -05:00
Richard Peter	8f1b5b647d	Issue #3102: Fix edexBridge connection leak ... Change-Id: Ic0938d31d9ff607249e980c443f98f251501b823 Former-commit-id: 2668f09447 [formerly 501980904d] [formerly b091a8827a [formerly 79c52892667d34abb651a36f7f5bd89f4143ffff]] Former-commit-id: b091a8827a Former-commit-id: d03c47719f	2014-05-06 10:32:31 -05:00
Chip Gobs	c075175e8e	VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168) and PostAnalysis (DR #9784) ) ... Change-Id: Id96c25de545144d769309fef608c431d67d1bada Former-commit-id: 4e4d00792d [formerly 65d2135ac2] [formerly e42bef2a33 [formerly 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734]] Former-commit-id: e42bef2a33 Former-commit-id: 593b36d722	2014-05-06 10:48:35 -04:00
Loubna.Bousaidi	93a6523f46	ASM #511 changes to transmit_rfc_bias calls from MPE ... Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004 Former-commit-id: 1b5bccc451 [formerly 760ee964d6] [formerly 6d526cb1ff [formerly a6033a982c80e822d9f4cb62a70b9722d79432c6]] Former-commit-id: 6d526cb1ff Former-commit-id: e28ec3469d	2014-04-29 21:09:34 +00:00
Steve Harris	b99ed0cce6	Merge branch 'omaha_14.2.2' (14.2.1-14,15) into development ... Former-commit-id: 29f4f53d27 [formerly a70710b467] [formerly 656ae897c1 [formerly eeb50c8acbe727769ed7f14b63b94af5b14bbf3f]] Former-commit-id: 656ae897c1 Former-commit-id: b1d31f21bc	2014-03-26 16:19:26 -05:00
Brian.Dyke	412a7eb2c2	Fixed comment merge conflicts added .gitignore ... Former-commit-id: 027cca8673 [formerly 7cc471a9c9] [formerly a0e7cb624a [formerly 6093428342170b9fd8deb741a5721375e80bc955]] Former-commit-id: a0e7cb624a Former-commit-id: d8256c4226	2014-03-25 15:41:58 -04:00
Steve Harris	5d95d594f8	Merge branch 'omaha_14.2.1' (14.2.1-13) into development ... Former-commit-id: 5efb16fa8b [formerly d0aeb854f5] [formerly 0c2c5ad4bd [formerly a2318f04eea89a258400dea526daa4fe67b69271]] Former-commit-id: 0c2c5ad4bd Former-commit-id: b5a2d2237f	2014-03-17 15:55:41 -05:00
Shawn.Hooper	b7cf50dd31	ASM #377 - Baseline National River Location Database fails ... Change-Id: Idbad0e02ca895b7e649c9d3e7165673fbd1cbaae Former-commit-id: 6a8a1c397b [formerly 670da1895b] [formerly 85db05e819 [formerly 5dcb5b019f389e64435b0283d95fe477032d88cc]] Former-commit-id: 85db05e819 Former-commit-id: 62a0c1dadf	2014-03-07 13:12:11 -05:00
Brad Gonzales	4ba60d8a6f	Issue #2885 Updated all of the PDE builds to Java 1.7. ... Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b Former-commit-id: a24cbcfa77 [formerly 0e3dc17872] [formerly dea17a19da [formerly 6d2a542774db6c37cfc2a65f490ebf618f2e7954]] Former-commit-id: dea17a19da Former-commit-id: 78d35d4033	2014-03-06 16:29:37 -06:00
David Gillingham	a83191356d	Issue #2783: Rewrite run_report_alarm script into EDEX service. ... Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be Former-commit-id: 607ce13c19 [formerly 32719432ff] [formerly de12904c7a [formerly d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd]] Former-commit-id: de12904c7a Former-commit-id: 1520317c24	2014-02-18 13:24:37 -06:00
Brian.Dyke	2955d5c9f0	Issue #179 ... Former-commit-id: 6b3ebc4fef [formerly a0626cdc00] [formerly b23c6f59f7 [formerly d8f5c94fdc7a3332293e24c5e59d1d7177a5fcd9]] Former-commit-id: b23c6f59f7 Former-commit-id: 6d58d8c016	2014-02-04 16:53:34 -05:00
Ron Anderson	dca7f21f7b	Merge branch 'master_14.1.1' into solutions ... Conflicts: cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5 Former-commit-id: 0bde38cef3 [formerly ba7a25a88f] [formerly 62c445d872 [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]] Former-commit-id: 62c445d872 Former-commit-id: 624375267e	2014-01-13 17:45:20 -06:00
Steve Harris	282d10fe6d	14.1.1-15 baseline ... Former-commit-id: f88ff2bde9 [formerly 8bbd803ace] [formerly d8e5799328 [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]] Former-commit-id: d8e5799328 Former-commit-id: 35d8f5a281	2014-01-06 14:08:08 -05:00
Richard Peter	60679a818a	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: b3b23647b4 [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]] Former-commit-id: a0b6ea8bb2 Former-commit-id: da027298d4	2013-12-05 12:12:27 -06:00
Steve Harris	4e6f319422	14.1.1-12 baseline ... Former-commit-id: 371d1ca63c [formerly b24d9c80b0] [formerly a3ec45a99f [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]] Former-commit-id: a3ec45a99f Former-commit-id: 14421048af	2013-12-04 16:47:59 -05:00
Steve Harris	1195e95c8b	Merge branch 'master_14.1.1' into omaha_14.1.1 ... Former-commit-id: b0a61f5695 [formerly 65d5f13864] [formerly b98eb9ffa4 [formerly 361e9942cf804578fb3e873229c1cd6fd6689fdf]] Former-commit-id: b98eb9ffa4 Former-commit-id: 6539b80ded	2013-12-02 16:17:38 -06:00
Steve Harris	8bd818de09	14.1.1-11 baseline ... Former-commit-id: 337b138200 [formerly 70a6f1936e] [formerly 71ae71c850 [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]] Former-commit-id: 71ae71c850 Former-commit-id: 5526a8999d	2013-12-02 17:10:10 -05:00
Brian Clements	90601f6ff8	Issue #2495 changed gridslice to use correct dimension datatype ... Former-commit-id: 4c3453a657 [formerly aa24bc6fce] [formerly 5e7f2f0bdf [formerly ad33e0ef6530c5528cfa5a349c34a1d11c8c453b]] Former-commit-id: 5e7f2f0bdf Former-commit-id: 05b2a015cb	2013-11-19 17:53:39 -06:00
Steve Harris	3f9df61017	Merge branch 'omaha_14.1.1' (14.1.1-9) into development ... Conflicts: cots/org.jep.linux32/libjep.so cots/org.jep.linux64/libjep.so nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so (took all the omaha_14.1.1 versions) Former-commit-id: 542a0946f2 [formerly 0a36987a01] [formerly 6d9efac6ef [formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]] Former-commit-id: 6d9efac6ef Former-commit-id: 869b505f80	2013-11-15 13:15:25 -06:00