Steve Harris
|
be2931c623
|
Merge branch 'master_14.3.1' (14.3.1-8) into omaha_14.3.1
Former-commit-id: 3bde6b3e41 [formerly 65a3390a6a [formerly ee696cb24c8d72f0562126a131824e958b88f090]]
Former-commit-id: 65a3390a6a
Former-commit-id: 4e26e224fd
|
2014-06-02 07:31:14 -05:00 |
|
Brian.Dyke
|
5524d6b38d
|
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: 3f1e12effc [formerly a8737e18f0 [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]
Former-commit-id: a8737e18f0
Former-commit-id: a0a879be7d
|
2014-05-30 10:46:25 -04:00 |
|
Steve Harris
|
835486c63f
|
Merge branch 'master_14.3.1' (14.3.1-7) into omaha_14.3.1
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
Former-commit-id: 048d3748b7 [formerly 2c49d14c12 [formerly 70398b6d6c43e8931d4d88660af2ba7a8b2668e2]]
Former-commit-id: 2c49d14c12
Former-commit-id: a4825f4b27
|
2014-05-28 07:41:42 -05: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 |
|
Steve Harris
|
e8e7e88400
|
Merge branch 'master_14.3.1' (14.3.1-6) into omaha_14.3.1
Former-commit-id: b059918699 [formerly 7dc84f4c74 [formerly 36b00a413b977ef5e11a46cf6f3d575e39ee4b57]]
Former-commit-id: 7dc84f4c74
Former-commit-id: 31711d4c5a
|
2014-05-23 08:09:39 -05:00 |
|
Steve Harris
|
74c5b0454c
|
Merge branch 'master_14.3.1' (14.3.1-5) into omaha_14.3.1
Former-commit-id: 2059fc9c0e [formerly 4899c4f56a [formerly eae5c3e75061566e40194730c2cfb2003d952e62]]
Former-commit-id: 4899c4f56a
Former-commit-id: 0a3b23d055
|
2014-05-22 14:05:06 -05: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 |
|
Roger Ferrel
|
466bfed41e
|
Issue #3181 Add check for valid array index.
Change-Id: I8e0a37bdd094b341da2ce42922a16d840d1ab468
Former-commit-id: adf6d95c01 [formerly a1f25b8748 [formerly ca01934f9e9d355dd4159fd472e2aa9bc0918898]]
Former-commit-id: a1f25b8748
Former-commit-id: fb4ac9acc7
|
2014-05-22 11:20:26 -05:00 |
|
Brian.Dyke
|
5afaee3d33
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
Former-commit-id: db68b80bbd [formerly 2fd18d14d6 [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]
Former-commit-id: 2fd18d14d6
Former-commit-id: 822ad181bf
|
2014-05-20 14:35:34 -04:00 |
|
Ron Anderson
|
0e02e83629
|
Issue #3069 Fix contour tool issues caused by GeoTools 10.5 update
Change-Id: I4d1bedc67059f0c9fdec3f7a5d2938869c12c465
Former-commit-id: 809548b283 [formerly 3b404f4083 [formerly b10be8ae235c4528c4ce83088daeccf8a0928933]]
Former-commit-id: 3b404f4083
Former-commit-id: b794dd04e1
|
2014-05-20 11:10:26 -05:00 |
|
Brian.Dyke
|
9426ddb9a9
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-8 into 14.2.1
Former-commit-id: 8c2cccb930 [formerly e5f951bf89 [formerly d9c230fbd50cc5acf1dd5c7c5e775f337de41921]]
Former-commit-id: e5f951bf89
Former-commit-id: 88a5ecefaa
|
2014-05-20 12:08:29 -04:00 |
|
Brian.Dyke
|
c9ef80beeb
|
CM-MERGE:OB13.5.5-9 into 14.1.2
Former-commit-id: abf0f995cd [formerly 545e7f6ce9 [formerly a2e2daca86d7efb28cb4e3eb8b9ef2ac92e1fc22]]
Former-commit-id: 545e7f6ce9
Former-commit-id: 8435ace4f8
|
2014-05-20 11:56:30 -04:00 |
|
Richard Peter
|
27f56c3f36
|
Issue #2726: Fix route start up order race condition
Change-Id: I3461f3e7c79ba099eb6c3eafa5b0345aa0fbf585
Former-commit-id: 974303044a [formerly 17b07813ba [formerly 802f537f26d88d43811df7c97382f6082f79a391]]
Former-commit-id: 17b07813ba
Former-commit-id: 74f1c41e68
|
2014-05-19 12:43:56 -05:00 |
|
Shawn Hooper
|
30173aa114
|
Merge "Revert "ASM #512 - Need radar data watchdog functionality"" into asm_14.3.1
Former-commit-id: 342398e6a3 [formerly 189e3cc1f2 [formerly ddeadcf968d945a322e8a9c8a8d25753782887f0]]
Former-commit-id: 189e3cc1f2
Former-commit-id: 476c78a2d7
|
2014-05-19 12:18:46 -05:00 |
|
Shawn Hooper
|
3f8ffcfaaf
|
Revert "ASM #512 - Need radar data watchdog functionality"
This reverts commit d74a7c5460 [formerly 0c8c5ef728] [formerly 9988804887] [formerly 7e036b2bbc [formerly 9988804887 [formerly ad727f0b3d820cf2310b4b8cc67639b6d141af6b]]].
Change-Id: I730af948f1d0cfcf2167524ea934ffc8a57ece87
Former-commit-id: 20541c39ca [formerly 4a4ca91f69 [formerly 75d287edfc717bb0d085a9723c417edbce035237]]
Former-commit-id: 4a4ca91f69
Former-commit-id: 28660769ec
|
2014-05-19 11:27:43 -05: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 |
|
Brian.Dyke
|
99e1c53457
|
Merge branch 'omaha_14.2.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1
Former-commit-id: dcd238c6a3 [formerly 3183283e99 [formerly 18486e2e8ead4614c05e3a7775cba95cd78053c8]]
Former-commit-id: 3183283e99
Former-commit-id: c2afc26206
|
2014-05-16 08:45:47 -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 |
|
Brian.Dyke
|
f9a40a24e3
|
Merge remote-tracking branch 'remotes/origin/master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-5 into 14.2.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
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
Former-commit-id: c8f21e92fe [formerly b066572041 [formerly d75db45cdfa20fed7568b825ca0dfd8c8689d22a]]
Former-commit-id: b066572041
Former-commit-id: 2de7de6378
|
2014-05-15 16:40:47 -04:00 |
|
Brian.Dyke
|
ac7b375d91
|
CM-MERGE:OB13.5.5-6 into 14.1.2
Former-commit-id: c81d54b651 [formerly 81a1affe22 [formerly 11acfb00bda7686c68e24903df4831cf57bf86de]]
Former-commit-id: 81a1affe22
Former-commit-id: 08f69fd3a1
|
2014-05-15 14:16:38 -04:00 |
|
Roger Ferrel
|
9d4e4ac430
|
Issue #2881 configuration changes.
Former-commit-id: 365c886263 [formerly e6b3733fc5 [formerly a36e9351bec9150ba4ade456de76af8701048bcb]]
Former-commit-id: e6b3733fc5
Former-commit-id: 422504f8b8
|
2014-05-14 16:35:33 -05:00 |
|
Dave Hladky
|
0e73a4d2a8
|
Issue #3168 Move DD retrieval distibution to correct feature/RPM
Change-Id: I1110eec9d4cde805a67cc33254b98fc00fd8a7b1
Former-commit-id: 783cd9e308 [formerly c72be97b9b [formerly d94e7f139573caa508b260902870c9f745080bb8]]
Former-commit-id: c72be97b9b
Former-commit-id: 3b544c74b6
|
2014-05-14 16:13:57 -05:00 |
|
Brian.Dyke
|
8c0709798d
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-24 into 14.2.2
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.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.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
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
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: d3fa10028c [formerly 627541512d [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]
Former-commit-id: 627541512d
Former-commit-id: f38d0138e6
|
2014-05-14 16:08:16 -04:00 |
|
Qinglu.Lin
|
c9e359f947
|
ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I31cc6fe46fff0f9246585ddbf84b2f94b3d8c22c
Former-commit-id: c5097660c2 [formerly 75c4b15e8e [formerly 763641d787f7f8c79bf28456314dcc16786702ed]]
Former-commit-id: 75c4b15e8e
Former-commit-id: b7d276d00f
|
2014-05-14 15:30:16 -04:00 |
|
Dave Hladky
|
6a80ab5dfb
|
Issue #3168 Move retrieval distribution to correct DD RPM
Former-commit-id: 15366714ed [formerly ca644b93ee [formerly 228ef1ceb7337fa38c370c3218d1c32b4f1302fb]]
Former-commit-id: ca644b93ee
Former-commit-id: 40c24180cf
|
2014-05-14 11:12:55 -05:00 |
|
Steve Harris
|
2441e29987
|
Merge branch 'master_14.2.1' (14.2.1-24) into omaha_14.2.1
Former-commit-id: 70b95c7636 [formerly c2efe26c11 [formerly 2627e4d38b3dcee82dcf7a6032d692170d50d9ad]]
Former-commit-id: c2efe26c11
Former-commit-id: 462609aa3f
|
2014-05-13 15:23:57 -05:00 |
|
Brian.Dyke
|
e705786d12
|
Merge branch 'merge_resolutions' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1 CM-MERGE:OB14.1.2-4 into 14.2.1
Former-commit-id: fb4c7e55b3 [formerly e95bc87a19 [formerly 019c1405290753ed47cecd9a0bb26c220d78d010]]
Former-commit-id: e95bc87a19
Former-commit-id: 5a2e0c7e1b
|
2014-05-13 11:23:55 -04:00 |
|
Paul.Grell
|
d74a7c5460
|
ASM #512 - Need radar data watchdog functionality
Change-Id: I3bcdbe8f267f78be1d0bc64e466ffed70be011a3
Former-commit-id: 7e036b2bbc [formerly 9988804887 [formerly ad727f0b3d820cf2310b4b8cc67639b6d141af6b]]
Former-commit-id: 9988804887
Former-commit-id: 0c8c5ef728
|
2014-05-12 20:00:18 -04:00 |
|
Richard Peter
|
3bca4a1d8a
|
Issue #2854: Fix merge of textdb
Change-Id: I626eabc72fbedde983e592ec0c8fb50ed1f52ae3
Former-commit-id: dd35516290 [formerly 1dc654c20e [formerly 2335691bb79c14d96e286f9b0be0f5085711c7bc]]
Former-commit-id: 1dc654c20e
Former-commit-id: 559907c32d
|
2014-05-12 17:31:06 -05:00 |
|
Richard Peter
|
bbdd7c01a7
|
Issue #2060: Consolidate grid indexes.
Change-Id: Ibc77133cd1b016ef85bae61e47e373a30e6e4d23
Former-commit-id: 6143d43329 [formerly 62e215eb89 [formerly 892c0f28a13d53118141efe14762deebe169d7ba]]
Former-commit-id: 62e215eb89
Former-commit-id: 50fb33488c
|
2014-05-12 16:59:34 -05:00 |
|
Steve Harris
|
343444715e
|
Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
tests/.classpath
tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java
Former-commit-id: fc2bf6b45c [formerly cf62cf4a6e [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]
Former-commit-id: cf62cf4a6e
Former-commit-id: 848519177d
|
2014-05-12 16:13:19 -05:00 |
|
Juliya Dynina
|
acd50d3ec2
|
Merge "ASM #539 - Multiple flag functionality for textdb is not working properly" into asm_14.3.1
Former-commit-id: 2578e13ee8 [formerly a203a14e52 [formerly 3fcd47133ac461046524837f085359b5eb1c7ba7]]
Former-commit-id: a203a14e52
Former-commit-id: 161d2039f7
|
2014-05-12 14:52:50 -05:00 |
|
Kiran.Shrestha
|
90e1ca7e3d
|
ASM #539 - Multiple flag functionality for textdb is not working properly
Change-Id: I6f48e877a356fa576e1311da769c90735e61877f
Former-commit-id: c162868850 [formerly e615e1efc5 [formerly 2e2de40d75c0ebc0af1b2d70806e834c7d5089f8]]
Former-commit-id: e615e1efc5
Former-commit-id: d4970b6f2f
|
2014-05-12 15:16:14 -04: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 |
|
Richard Peter
|
a661a16f01
|
Issue #3154: Remove stats reclaimSpace call
Change-Id: I32fb957e236f257e5d8164833d2d2c1adf1fa639
Former-commit-id: 5648e27bbc [formerly fae9e811fb [formerly 4e35d1fa5e3e1ebaa5d177d95a5eb11741ae57d2]]
Former-commit-id: fae9e811fb
Former-commit-id: a077fd9cc6
|
2014-05-12 12:27:32 -05:00 |
|
Ben Steffensmeier
|
b2d89eae80
|
Issue #2289 Fix TempOfTe at small pressure values.
Former-commit-id: 102d560686 [formerly 2754326906 [formerly a114bf15018ab86ec1511c13704fd6e1e3feed99]]
Former-commit-id: 2754326906
Former-commit-id: d051416c76
|
2014-05-12 10:11:34 -05:00 |
|
Juliya Dynina
|
d63bd649af
|
Merge "ASM #551 - EDEX can decode some METAR peak wind fields as 6 hour min/max temperature" into asm_14.3.1
Former-commit-id: a6dfa2ce46 [formerly ae025b5ef5 [formerly 7f7a086a5cb6ad94aac34973b028150021a616f0]]
Former-commit-id: ae025b5ef5
Former-commit-id: 72c7889020
|
2014-05-12 09:58:14 -05:00 |
|
Juliya Dynina
|
55810ba130
|
Merge "ASM #515 - WarnGen product QC incorrectly reports UGC/area mismatch" into asm_14.3.1
Former-commit-id: 8bea01aa09 [formerly f9c2ef56a9 [formerly b8412f03c381032f90240af18f8175ab9b3a5a26]]
Former-commit-id: f9c2ef56a9
Former-commit-id: 93834dac3e
|
2014-05-12 09:57:38 -05:00 |
|
David Friedman
|
a9a6f2fa3d
|
ASM #551 - EDEX can decode some METAR peak wind fields as 6 hour min/max temperature
Change-Id: I1bf62b197f65073dc26356e9eb67d32f7f8ee45c
Former-commit-id: 20c7e2f29d [formerly 3be74c3664 [formerly 8d9e72c309cbcef7b0cd8656333e05202e0a290b]]
Former-commit-id: 3be74c3664
Former-commit-id: ad99a4f615
|
2014-05-12 13:18:50 +00:00 |
|
Nate Jensen
|
ab17f8b84e
|
Merge "Issue #2928: Increase default thriftService byte limit to 250MB" into omaha_14.3.1
Former-commit-id: 5849925092 [formerly 486c69045d [formerly dac16ee8f25f6f265426405ca2bff55aff5b57ba]]
Former-commit-id: 486c69045d
Former-commit-id: ed687984f7
|
2014-05-09 10:57:53 -05:00 |
|
Richard Peter
|
87dec39958
|
Issue #2928: Increase default thriftService byte limit to 250MB
Change-Id: I8a55fbce410e1787946f2dd38b3a41c84aab20bd
Former-commit-id: acadd5b815 [formerly bd033db0f4 [formerly 1c5060d53524f195be7854ca66160d3d075c3112]]
Former-commit-id: bd033db0f4
Former-commit-id: b809ed50fd
|
2014-05-09 10:37:18 -05:00 |
|
Qinglu.Lin
|
0e38232721
|
ASM #515 - WarnGen product QC incorrectly reports UGC/area mismatch
Change-Id: I5ef8e83c826d3fb1d5ef72d5866f882d9c97e1f5
Former-commit-id: 9b49cc2464 [formerly 50967b199d [formerly 04597aac301d0001143f3f5ad3bcf5d128d33b86]]
Former-commit-id: 50967b199d
Former-commit-id: 58c036c80d
|
2014-05-09 10:45:28 -04:00 |
|
Michael Gamazaychikov
|
a7c824d033
|
ASM #510 - textdb -pil -a command fails to add scripts with option
arguments.
Change-Id: I3f6c1c334db1100af0cb137f2f0a1a856564aaf4
Former-commit-id: c9df02db64 [formerly 97ec336416 [formerly 77b054caca0aa54d51fa947a4a8aa041ef0cdcab]]
Former-commit-id: 97ec336416
Former-commit-id: 6497950f3d
|
2014-05-09 14:45:27 +01:00 |
|
Gang.Zhang
|
9a1ba6435f
|
ASM #589 - Fix FFMP Templates generation issue
Change-Id: Ia3715ccb03113f3d2528e516c2568255935f4086
Former-commit-id: 165b953b5c [formerly f771c8fed4 [formerly 560a3cc5ac5e9e059b581294e48e69a9978272e5]]
Former-commit-id: f771c8fed4
Former-commit-id: fe742a06b9
|
2014-05-09 11:51:18 +01:00 |
|
Mike Duff
|
f4062cd277
|
Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13
Former-commit-id: 6a67638a94 [formerly 8498235fd8 [formerly 57755db0d6d77f32d64b4b569bb0af88002a23da]]
Former-commit-id: 8498235fd8
Former-commit-id: 0456fd0597
|
2014-05-08 14:36:54 -05:00 |
|
Ben Steffensmeier
|
7a38637fb2
|
Issue #3080 Fix NaN handling of SliceSample.
Former-commit-id: 1b6bdeac86 [formerly 0308147ad4 [formerly 9974018df428c84528cf98e9f868740accbabf58]]
Former-commit-id: 0308147ad4
Former-commit-id: 3a87fa24df
|
2014-05-08 11:49:04 -05:00 |
|
Nate Jensen
|
b415dd5c4e
|
Merge "Issue #2726: Fix GeospatialDataGenerator NPE" into omaha_14.3.1
Former-commit-id: d4fef60be1 [formerly 8f8ac40c44 [formerly 34d2d296f304cd84a8105993803ca35c484c6b6e]]
Former-commit-id: 8f8ac40c44
Former-commit-id: 3fdd5dbdd6
|
2014-05-08 10:19:43 -05:00 |
|
Richard Peter
|
469f2771c3
|
Issue #2726: Fix GeospatialDataGenerator NPE
Change-Id: I07213e17fcbbadea9a33471c390bb07472ba31e0
Former-commit-id: 4d99d25a55 [formerly 24539708f9 [formerly fdc542df454887a48f4a55ef6ea9594ff98b3345]]
Former-commit-id: 24539708f9
Former-commit-id: 5a7c78c009
|
2014-05-08 10:14:30 -05:00 |
|
Nate Jensen
|
c41e84630c
|
Issue #2060 fix grid updates and performance
Change-Id: I0937d7360e456f08fb613be547f7b488ebe05b50
Former-commit-id: acfbce58d1 [formerly e39378e5f0 [formerly a430e85f283b3e41b8520d241f675eff3c6c32e3]]
Former-commit-id: e39378e5f0
Former-commit-id: c71edb2d4c
|
2014-05-07 15:30:13 -05:00 |
|