Shawn.Hooper
fe567b2a5b
ASM #209 - Fix Svcbu cleanup script
...
Change-Id: I4da44d4c410c03769e556dc6abca62db52880997
Former-commit-id: 626ee991cd7e9dbfe52342abd9e3fd41b973f72a
2014-05-29 16:56:46 -04:00
Brian.Dyke
2fd18d14d6
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: ed430b59789d9a00e20bdaadc8d55b92a4a4064b
2014-05-20 14:35:34 -04:00
Brian.Dyke
e5f951bf89
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-8 into 14.2.1
...
Former-commit-id: d9c230fbd50cc5acf1dd5c7c5e775f337de41921
2014-05-20 12:08:29 -04:00
Brian.Dyke
545e7f6ce9
CM-MERGE:OB13.5.5-9 into 14.1.2
...
Former-commit-id: a2e2daca86d7efb28cb4e3eb8b9ef2ac92e1fc22
2014-05-20 11:56:30 -04:00
Brian.Dyke
dbd3bb54e8
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: 19032f03b1d2166f4afd936bb2b56e0b4851d9f4
2014-05-19 14:07:04 -04:00
Brian.Dyke
b29db01a59
CM-MERGE:OB13.5.5-8 into 14.1.2
...
Former-commit-id: 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470
2014-05-19 13:26:45 -04:00
Gang.Zhang
94fea6748f
ASM #95 - Fix 0.0 for NO DATA Issue caused failed back.
...
Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac
Former-commit-id: 5880dcd0b727c3d473873b8382ace78955ab800b
2014-05-19 15:40:41 +01:00
Brian.Dyke
f8ed9c7944
CM-MERGE:OB13.5.5-7 into 14.1.2
...
Former-commit-id: 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114
2014-05-19 07:55:42 -04:00
David Friedman
c909746e0e
Merge "ASM #240 - RPS lists delivered by awips2-rcm out of date" into asm_14.2.2
...
Former-commit-id: a4c1c5524c31384c3532076ee151fd9a294367d2
2014-05-16 16:40:38 -05:00
David Friedman
caa38ec709
ASM #240 - RPS lists delivered by awips2-rcm out of date
...
Change-Id: I811bfebab480c5655f7260b85daa36f69e9550eb
Former-commit-id: 880c5d7259a5af17f2452fa3bd9f18d852c81d82
2014-05-16 21:38:34 +00:00
David Friedman
1503bc4162
ASM #592 - RadarServer does not sent OTRs for RSS product to TDWRs
...
Change-Id: Iabb354391ea63b6f9c316ea8316fc28128a956f5
Former-commit-id: 4fd6bbfba29a39bf125269ab8342b826995e3d86
2014-05-16 21:34:59 +00:00
Brian.Dyke
3183283e99
Merge branch 'omaha_14.2.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: 18486e2e8ead4614c05e3a7775cba95cd78053c8
2014-05-16 08:45:47 -04:00
Brian.Dyke
b066572041
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: d75db45cdfa20fed7568b825ca0dfd8c8689d22a
2014-05-15 16:40:47 -04:00
Brian.Dyke
81a1affe22
CM-MERGE:OB13.5.5-6 into 14.1.2
...
Former-commit-id: 11acfb00bda7686c68e24903df4831cf57bf86de
2014-05-15 14:16:38 -04:00
Dave Hladky
c72be97b9b
Issue #3168 Move DD retrieval distibution to correct feature/RPM
...
Change-Id: I1110eec9d4cde805a67cc33254b98fc00fd8a7b1
Former-commit-id: d94e7f139573caa508b260902870c9f745080bb8
2014-05-14 16:13:57 -05:00
Brian.Dyke
627541512d
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: f7d6bee49c5777e5d63c724eba1242a1baf153ac
2014-05-14 16:08:16 -04:00
Shawn Hooper
2fe0c47c6d
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: b774242fcff4bf603b82c8a6657e372d8bdc3c19
2014-05-14 14:39:57 -05:00
Dave Hladky
ca644b93ee
Issue #3168 Move retrieval distribution to correct DD RPM
...
Former-commit-id: 228ef1ceb7337fa38c370c3218d1c32b4f1302fb
2014-05-14 11:12:55 -05:00
Steve Harris
c2efe26c11
Merge branch 'master_14.2.1' (14.2.1-24) into omaha_14.2.1
...
Former-commit-id: 2627e4d38b3dcee82dcf7a6032d692170d50d9ad
2014-05-13 15:23:57 -05:00
Brian.Dyke
e95bc87a19
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: 019c1405290753ed47cecd9a0bb26c220d78d010
2014-05-13 11:23:55 -04:00
Steve Harris
cf62cf4a6e
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: a830db2a282e6a29d119fc0d3357c2223c48d175
2014-05-12 16:13:19 -05:00
Brian.Dyke
386ec058e1
CM-MERGE:OB13.5.5-5 into 14.1.2
...
Former-commit-id: 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3
2014-05-12 14:07:11 -04:00
Ben Steffensmeier
2754326906
Issue #2289 Fix TempOfTe at small pressure values.
...
Former-commit-id: a114bf15018ab86ec1511c13704fd6e1e3feed99
2014-05-12 10:11:34 -05:00
Gang.Zhang
f771c8fed4
ASM #589 - Fix FFMP Templates generation issue
...
Change-Id: Ia3715ccb03113f3d2528e516c2568255935f4086
Former-commit-id: 560a3cc5ac5e9e059b581294e48e69a9978272e5
2014-05-09 11:51:18 +01:00
David Gillingham
9ebbf783df
Issue #3142 : Improve error-handling and logging in CleanupGfeHDF5Storage delta script.
...
Change-Id: I5c75cfb44654781a53f4588236f5d5d562432615
Former-commit-id: 920999bda9dda329e71359ab46872130f45d298c
2014-05-08 16:51:41 -05:00
Ben Steffensmeier
d7cb05fd92
Issue #3119 Optimize plot rendering.
...
Former-commit-id: 006df5b77f8f09e0b083b3c3e644744653f3d269
2014-05-07 13:27:48 -05:00
Brian.Dyke
f27d1b1efe
Merged 13.5.5 -4 into 1412
...
Former-commit-id: 5644361dffaae25c63748a52c23506907210c741
2014-05-07 13:07:15 -04:00
Steve Harris
c3509757f0
Merge branch 'master_14.2.1' (14.2.1-23) into omaha_14.2.1
...
Former-commit-id: 575adeb94784b32ac0d89e3c4dd506c2fe500266
2014-05-07 08:45:41 -05:00
Ron Anderson
b43e6d64c3
Issue #3129 Change smartInit back to 1 thread on 64-bit
...
Change-Id: Ie1e17e145d2d88485d91a29e4c74c737e4658038
Former-commit-id: f2e15f4ab034f617a3a64814125dfee73b5070ac
2014-05-06 16:01:31 -05:00
Ron Anderson
b4815af7f8
Issue #3118 Fix gridLocation issues with smartInit databases
...
Change-Id: I4660418234a5c721381c7986b793d9339c81c603
Former-commit-id: a4a5522abbb439066acfa3567d0036cf044ef9c7
2014-05-06 15:09:25 -05:00
Brian.Dyke
238e8f7ba1
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: c6ba49e1206ed113b57a9fa39f5720ee9b3b979a
2014-05-06 11:34:46 -04:00
Richard Peter
501980904d
Issue #3102 : Fix edexBridge connection leak
...
Change-Id: Ic0938d31d9ff607249e980c443f98f251501b823
Former-commit-id: 79c52892667d34abb651a36f7f5bd89f4143ffff
2014-05-06 10:32:31 -05:00
Brian.Dyke
90fecdc71e
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
...
Former-commit-id: 9adc24725f9bd3499d8f498990413df7718de83e
2014-05-06 11:25:15 -04:00
Sathya.Sankarasubbu
edd543c48d
ASM #560 - LDM 6.11.5 GRIB library causing crash
...
Modified Release number in component.spce from 10 to 11
Change-Id: I2f011e472688fa63d605db5d715f1aef6589a966
Former-commit-id: cdeb7f00af695c6d0a79958af23862bd6f3c7ee5
2014-05-05 14:33:20 -04:00
Steve Harris
6ef3b9f1e5
Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22)
...
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml
Former-commit-id: c782956ef32875130bd97a0bdbffdf005e1940e3
2014-05-05 08:21:02 -05:00
Shawn.Hooper
76d4a7ac73
ASM #131 - Additional fix for Lightning Data Decoder
...
Change-Id: I014a5ce61e495c2339f17ef22f706a3ad1a1ee72
Former-commit-id: 4bada72eef85bf38522b40526643ebd8bddc9005
2014-05-02 12:48:18 -04:00
David Gillingham
aa78ed1b69
Issue #3105 : Ensure ParmManager adds mutable db to internal db list if db is created during initialization.
...
Change-Id: I85de2a8182abcd0504ceee75076a3c7a72905daf
Former-commit-id: 3d8a23e2e2802d19768de47c61cedb723ec53c8f
2014-05-01 16:19:51 -05:00
Ben Steffensmeier
d98bdd64d8
Issue #3100 Time match mosaics on data update.
...
Former-commit-id: 3655558c91224a57a31cfb25389cee33258e0227
2014-05-01 14:17:33 -05:00
Qinglu.Lin
e489658072
ASM #123 Zone UGC line not locked
...
Change-Id: I5eb7ed0bee68599fe4ece0810fe76cb5c794d29c
Former-commit-id: 108895dccefb42c71d0f47b13bfd64591e8dca98
2014-05-01 14:49:27 -04:00
brian.dyke
d56fab37e7
Merge branch 'master_14.2.1-22' into asm_14.2.1
...
Former-commit-id: 3666b29a33ca9c758fa87bd387ebd6ad49b97b2a
2014-04-30 14:21:11 -04:00
Ron Anderson
374e8224f1
Issue #3097 Fix return type for SmartScript.getGrids()
...
Change-Id: I13cfa413c5efa32216d08276be57825aff8c0ca0
Former-commit-id: 1b0bc4789a7166911762d9947552fe54bfe0a137
2014-04-30 17:26:57 +00:00
Brian.Dyke
35b637c3e2
Merge branch 'master_14.2.1' into master_14.2.2
...
Merge (14.2.1-21 into 14.2.2-5)
Former-commit-id: 9a017e543fc6be9fd0d7b9361bd2226bf2af6211
2014-04-29 12:07:21 -04:00
Richard Peter
a80d2981ba
Merge "Issue #3084 Fix NXxNY in master_grib2_lookup, update and comment master_grib2_lookup entries." into omaha_14.2.1
...
Former-commit-id: f3e957f70651f4c50693ba5296b633659671cf63
2014-04-28 16:40:58 -05:00
Ben Steffensmeier
25e4eee58a
Issue #3084 Fix NXxNY in master_grib2_lookup, update and comment master_grib2_lookup entries.
...
Former-commit-id: b75445ffea12040487d57bdf248ff3fd48877d8d
2014-04-28 16:26:04 -05:00
Steve Harris
ccd49b08f0
Merge branch 'master_14.2.1' (14.2.1-21) into omaha_14.2.1
...
Former-commit-id: 077a9b72ccb0072634c7c63e241ba50e965b7ed8
2014-04-28 15:26:43 -05:00
brian.dyke
6cc1c166f9
Merge branch 'master_14.2.1' into asm_14.2.1
...
Merge (master_14.2.1-21) into asm_14.2.1
Former-commit-id: 2cd6c57e232b4f4a2a24c54d74e7ce9f08351b79
2014-04-28 14:06:15 -04:00
Shawn.Hooper
4d6af11742
Merge "ASM #577 - Removed com.raytheon.viz.dataaccess.feature plugin from p2-build.xml" into asm_14.2.1
...
Former-commit-id: 9d7862fb7e7f4c3a16ba42b65e9111087dc0c8b3
2014-04-28 09:37:28 -05:00
Shawn.Hooper
a3e52e8cea
ASM #577 - Removed com.raytheon.viz.dataaccess.feature plugin from p2-build.xml
...
Change-Id: I505a9cc943b7ab09b430ca826efa1ee81f08a930
Former-commit-id: 968a136e81b6247a03af9b78643c388d21a4218b
2014-04-25 10:40:43 -04:00
Shawn.Hooper
09204a381c
ASM #224 - WarnGen: OB13.5.2 Template Errors
...
Change-Id: I99339c0ea3d0110ca855dd3db82b41b28a32dd6d
Former-commit-id: c6fffaf265dc184b7692a43bb461572f54b8190a
2014-04-25 10:19:48 -04:00
Steve Harris
4f9620bb04
Merge branch 'master_14.2.1' (14.2.1-19,20) into omaha_14.2.1
...
Change-Id: Ib48a2c15e266cd012aba975c25ef094b828a0f68
Former-commit-id: 749922901de5a57c7344f29def844a5ecf90304a
2014-04-25 09:09:38 -05:00
