xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5770 commits 31 branches 40 tags 3.8 GiB
Commit graph

5770 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ana Rivera
c1e504cdfa VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999 
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e

Former-commit-id: 9da58db461 [formerly 65e90953c2 [formerly 83640ccce75b600d53a0d44ae1528c312b7947b5]]
Former-commit-id: 65e90953c2
Former-commit-id: 4b515bfd0a
 2014-06-11 17:35:55 +00: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
Brian.Dyke
4b0bf4f7af Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1 
Former-commit-id: c6244e1950 [formerly b8ba378862 [formerly dec7b6fa091cab098b89a51551fa46b9f28b959b]]
Former-commit-id: b8ba378862
Former-commit-id: de2df4cb6f
 2014-06-02 07:01:37 -04: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
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
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
7c9b12df92 VLab Issue #3720 - NCEP EDEX and EDEX Common delivery for 14.3.1 
Removed dependency on persistCamelRegistered from ncgrib spring config

Change-Id: I84e7b6fc6e50f9d1795e887a9fb30f9cdda3a7f8

Former-commit-id: 4299e7c72c [formerly 3b8233dd88 [formerly a7140f38a54a577dd2d62cc551ab182b561f6fc0]]
Former-commit-id: 3b8233dd88
Former-commit-id: 0dff405bc4
 2014-05-22 14:35:49 -04: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
Ron Anderson
4c33bf1b30 Issue #3194 Fix GeoTIFF import 
Change-Id: I465296c8a67a49f8f0680b34025b71ae4986c84a

Former-commit-id: 2a680b73ea [formerly 52931af5ce [formerly 8082b27e6e7e0a0be372abb40b62c0a0224ee49c]]
Former-commit-id: 52931af5ce
Former-commit-id: a8ba16fc93
 2014-05-22 09:53:47 -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
Brian.Dyke
432e5f15a5 Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-6,-7 into 14.2.1 
Former-commit-id: d5a4669fc4 [formerly dbd3bb54e8 [formerly 19032f03b1d2166f4afd936bb2b56e0b4851d9f4]]
Former-commit-id: dbd3bb54e8
Former-commit-id: c4b7b8dd74
 2014-05-19 14:07:04 -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
Brian.Dyke
75f7d77c45 CM-MERGE:OB13.5.5-8 into 14.1.2 
Former-commit-id: 06c2478539 [formerly b29db01a59 [formerly 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470]]
Former-commit-id: b29db01a59
Former-commit-id: 2eae2be646
 2014-05-19 13:26:45 -04: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
Gang.Zhang
98e50ae694 ASM #95 - Fix 0.0 for NO DATA Issue caused failed back. 
Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac

Former-commit-id: 9c1587b92d [formerly 94fea6748f [formerly 5880dcd0b727c3d473873b8382ace78955ab800b]]
Former-commit-id: 94fea6748f
Former-commit-id: 6e034005e0
 2014-05-19 15:40:41 +01: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
a9f2fdb086 CM-MERGE:OB13.5.5-7 into 14.1.2 
Former-commit-id: e9bd17a21f [formerly f8ed9c7944 [formerly 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114]]
Former-commit-id: f8ed9c7944
Former-commit-id: 509616ba6a
 2014-05-19 07:55:42 -04:00
David Friedman
99edfe0a17 Merge "ASM #240 - RPS lists delivered by awips2-rcm out of date" into asm_14.2.2 
Former-commit-id: a55e851780 [formerly c909746e0e [formerly a4c1c5524c31384c3532076ee151fd9a294367d2]]
Former-commit-id: c909746e0e
Former-commit-id: a920c5a5e4
 2014-05-16 16:40:38 -05:00
David Friedman
a13190aeb9 ASM #240 - RPS lists delivered by awips2-rcm out of date 
Change-Id: I811bfebab480c5655f7260b85daa36f69e9550eb

Former-commit-id: eab9a6b6d7 [formerly caa38ec709 [formerly 880c5d7259a5af17f2452fa3bd9f18d852c81d82]]
Former-commit-id: caa38ec709
Former-commit-id: b462660d75
 2014-05-16 21:38:34 +00:00
David Friedman
39e412aac8 ASM #592 - RadarServer does not sent OTRs for RSS product to TDWRs 
Change-Id: Iabb354391ea63b6f9c316ea8316fc28128a956f5

Former-commit-id: 3b69a240c8 [formerly 1503bc4162 [formerly 4fd6bbfba29a39bf125269ab8342b826995e3d86]]
Former-commit-id: 1503bc4162
Former-commit-id: 404f3af49e
 2014-05-16 21:34:59 +00: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
f68dd77088 VLab Issue #3721 - NCEP CAVE plugin delivery for 14.3.1 
Updates to various resource plugins such as ncgrid, plotdata, ncscat,
and ntrans

Change-Id: Ie04200519fad583d2b252ea161cb5c72eb90732c

Former-commit-id: e1b0c5f102 [formerly 57cf6c4bd7 [formerly 0832f7cdc3c6f020f5fe97dde01ed17cf98eebb2]]
Former-commit-id: 57cf6c4bd7
Former-commit-id: 5885bff027
 2014-05-15 18:31:17 -04:00
Stephen Gilbert
003aa6e113 VLab Issue #3721 - NCEP CAVE plugin delivery for 14.3.1 
PGEN Bug Fixes

Change-Id: Ie50d8f829e0dfb00fab254945a46592553cdb59c

Former-commit-id: d6f370db60 [formerly e71b522740 [formerly 2f93fd7bdbcf1fa4698dfc2dd51c377db6d809b6]]
Former-commit-id: e71b522740
Former-commit-id: be04b1b1d9
 2014-05-15 17:40:04 -04:00
Stephen Gilbert
5e1cd16ad7 VLab Issue #3721 - NCEP CAVE plugin delivery for 14.3.1 
Localization/configuration file updates

Change-Id: I489d8228f17534234cd8ea20e10a137a17bad054

Former-commit-id: 4f2a631e66 [formerly 60b9ec665b [formerly c55835291b5d2bbe24c4398851e23a5c28d5e582]]
Former-commit-id: 60b9ec665b
Former-commit-id: cb483a72ff
 2014-05-15 17:25:39 -04:00
Stephen Gilbert
5b0c446a2f VLab Issue #3722 - SWPC delivery for 14.3.1 
Upgrades to Geomag and solar image processing

Change-Id: Ibe33d00843419e34998274a87734f3f29d2b63dc

Former-commit-id: 4d2154d2de [formerly 5da74a455d [formerly c9bcc3d15adcea014696e5cd68b9688506ee07d9]]
Former-commit-id: 5da74a455d
Former-commit-id: ed8b7bc0cb
 2014-05-15 17:24:13 -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
Shawn Hooper
183109f238 Merge "ASM #560 - LDM 6.11.5 GRIB library causing crash Modified Release number in component.spce from 10 to 11" into asm_14.2.2 
Former-commit-id: 24918bda30 [formerly 2fe0c47c6d [formerly b774242fcff4bf603b82c8a6657e372d8bdc3c19]]
Former-commit-id: 2fe0c47c6d
Former-commit-id: 3143b15d26
 2014-05-14 14:39:57 -05: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
Bryan Kowal
aacf4cd27a Issue #3159 - rebuild with newer gridslice source 
Change-Id: I78c2337af37289b8e1190b142778006dfbdb6ebc

Former-commit-id: 8d5326cc1b [formerly 3535340136 [formerly 2b13221d7c644147f6eda1acb8b126667be00926]]
Former-commit-id: 3535340136
Former-commit-id: a352aadc90
 2014-05-13 14:43:04 -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
Matthew Howard
84f26ca9f5 Merge "ASM #509 GFE: Product editor still auto-wraps when the option is turned off" into asm_14.3.1 
Former-commit-id: 576a2d63ec [formerly 5a20085f32 [formerly 2052df4ca5f68165b477994b21357c245ff73546]]
Former-commit-id: 5a20085f32
Former-commit-id: 7b087f422d
 2014-05-13 07:49:18 -05: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