Richard Peter
b091a8827a
Issue #3102 : Fix edexBridge connection leak
...
Change-Id: Ic0938d31d9ff607249e980c443f98f251501b823
Former-commit-id: 79c52892667d34abb651a36f7f5bd89f4143ffff
2014-05-06 10:32:31 -05:00
Brian.Dyke
04b8da6f73
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
Steve Harris
1c8f2f6185
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
d80a278cb7
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
f368412ef2
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
897f67301c
Issue #3100 Time match mosaics on data update.
...
Former-commit-id: 3655558c91224a57a31cfb25389cee33258e0227
2014-05-01 14:17:33 -05:00
brian.dyke
f3972ce929
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
613aa1e94a
Issue #3097 Fix return type for SmartScript.getGrids()
...
Change-Id: I13cfa413c5efa32216d08276be57825aff8c0ca0
Former-commit-id: 1b0bc4789a7166911762d9947552fe54bfe0a137
2014-04-30 17:26:57 +00:00
Richard Peter
ffa75b13ce
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
9985f518b1
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
88269840b6
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
cbe7b3ec72
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
57a9e0d586
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
b4597dc021
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
79db962a88
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
18e79fe08d
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
Brian.Dyke
ac74878ae2
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
...
Former-commit-id: 48184880ce65a4899a4ed989f2d3f8082771047f
2014-04-24 13:28:31 -04:00
Brian.Dyke
e82fc8f89c
Merged 13.5.5 -2 and -3 into 1412
...
Former-commit-id: 4e921dbeab89e61635144b441ae0015155376c59
2014-04-24 13:01:50 -04:00
Ron Anderson
859d709a03
Issue #3050 Fix SaveAsciiGridsHandler to get IFPServer instance based on site in the ParmID
...
Change-Id: Id2146e07f4e6103c9c96f2b09f0bae5980747052
Former-commit-id: 6f141288cae462aac8c1ea8c77dd7f88a33c382a
2014-04-22 14:38:54 -05:00
Zhidong.Hao
0177756f97
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
...
Change-Id: I6176b14c5451ebd4ee520c2e5a13157457009303
Former-commit-id: 4e7edc8ebbd79c16d6eb725c8d11d05f20424ed4
2014-04-22 14:31:14 -04:00
Dave Hladky
45059e722a
Issue #3012 Various fixes.
...
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 212e15c397fe22c3bc074e054d608c0094ce8dad
2014-04-21 12:26:47 -05:00
Richard Peter
1e33125cb7
Merge "Issue #3011 Fixed slot cleanup" into omaha_14.2.1
...
Former-commit-id: 8b8523aa60fa649a3208a5f3ae7dcb1fded3f0e6
2014-04-18 15:15:13 -05:00
Benjamin Phillippe
b86fae838f
Issue #3011 Fixed slot cleanup
...
Change-Id: I346b0e2c17bcc0f3bcf946772694c127e8baffa5
Former-commit-id: 4ac3c1a55fe7e99d7e9049ffb401b8ea3caf7983
2014-04-18 15:10:46 -05:00
Brian.Dyke
9943a331c3
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: d07d06f5e4b3c1dbf7d165ad97b9b114a4819011
2014-04-18 07:53:10 -04:00
Nate Jensen
8ba6b2722d
Issue #3018 addressing code review comments
...
Former-commit-id: 85d9dd0158ab873e1e9b76805853c712bb0c7c2c
2014-04-17 09:28:47 -05:00
Ron Anderson
1ba72371be
Merge "Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock" into omaha_14.2.1
...
Former-commit-id: 6813b32786289503950322c02e32803299566c5d
2014-04-16 18:02:11 -05:00
Nate Jensen
c362af04f3
Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock
...
Former-commit-id: 7384a2d32ef554362a0693038e9b60a589afb86a
2014-04-16 17:25:09 -05:00
Nate Jensen
31fb61e824
Issue #3039 fix ifpImage class cast exception
...
Former-commit-id: a2fd849c603aebacce09662557bf1f008d379982
2014-04-16 16:17:05 -05:00
Brian.Dyke
35ad867281
Merged 13.5.5-1 into 1412
...
Former-commit-id: f44629e87a6401a5b872c050b9cf79defd306171
2014-04-16 12:09:12 -04:00
Nate Jensen
e0ae9e5f8f
Merge "Issue #3017 Update SatSpatialFactory to have more specific methods." into omaha_14.2.1
...
Former-commit-id: 8e8bc62e063da4a8a864496ac6dbd73e798e45ed
2014-04-16 08:41:54 -05:00
Ron Anderson
9f085a0856
Issue #3016 Fix ColormappedImage and ColorMapper.
...
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b
Former-commit-id: f7d07544e07552c7fccf744c269ee4aa54dc745c
2014-04-15 17:22:12 -05:00
Ben Steffensmeier
6ea38cfbb2
Issue #3017 Update SatSpatialFactory to have more specific methods.
...
Former-commit-id: 08555e628c8caa41dc312ed91e3ecc9a39a1b5dc
2014-04-15 13:29:05 -05:00
Steve Harris
5bf5bdb6b0
Merge branch 'master_14.2.1' (14.2.1-17,18) into omaha_14.2.1
...
Former-commit-id: f4c8ce899d312b389aff32d052564559e79904be
2014-04-15 09:39:33 -05:00
Benjamin Phillippe
62062bf288
Issue #3011 Fixed replication slowdown
...
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109
Former-commit-id: 92c584179ddbad65c115092d3bf82ca6fe114b09
2014-04-15 09:15:12 -05:00
brian.dyke
a6708cc174
Merge branch 'master_14.2.1' into asm_14.2.1
...
Former-commit-id: 14cd23697c705352544609e7ba7a3afdf5d778b1
2014-04-14 15:29:23 -04:00
Zhidong.Hao
9c18f60924
ASM #474 - GFE ISC: AttributeError results in failure to process ISC grid
...
Change-Id: I5e5681f2647abfcd9cd8d97e6189c484b60e8fe1
Former-commit-id: 015d4307168ca7fbc70bf0ae0e2e9abd24463d90
2014-04-11 15:51:12 -04:00
Zhidong.Hao
1a91b820d9
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
...
Change-Id: Ib6114ba3cf11095fcfc2d89e356db53ca935244c
Former-commit-id: 30eba1a2397c41fed1b564af4c31791040b14eac
2014-04-11 15:34:06 -04:00
Brian.Dyke
9cce8eb0d1
Merge branch 'master_14.1.2_to_master_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: 4e5541582b38abcd744cf25549d007c9e8f1a104
2014-04-10 13:26:42 -04:00
Richard Peter
b15d288530
Merge branch 'master_14.1.2' into master_14.2.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2
2014-04-09 16:00:54 -05:00
Brian.Dyke
929b736038
Merged 1354 -7 and -8 into 1412
...
Former-commit-id: 082b54dc10676b7090f8a1c9a01929a6d7da2667
2014-04-09 11:39:07 -04:00
Ben Steffensmeier
000f259cf4
Issue #2973 Use correct area for expanding subgrid requests.
...
Former-commit-id: 3cc81be3ed534aed54bf80b0654f28f7fd86cc8b
2014-04-04 13:17:36 -05:00
Brian.Dyke
dd98c213c7
Merged 1354 -5 and -6 into 1412 based on 1411-25
...
Former-commit-id: 407b42b0eff676a95483e219d6be899e45effd6c
2014-04-04 12:57:32 -04:00
Steve Harris
cb2d69e338
Merge branch 'master_14.2.1' (14.2.1-16) into omaha_14.2.1
...
Former-commit-id: ce1a2d441c1c882209f56fcb82f79edad51ff114
2014-04-03 13:00:11 -05:00
Ron Anderson
d556055299
Issue #2969 Fixed error when Topo parm is unloaded.
...
Fixed check state of Topography menu item.
Change-Id: I3cd13d91b489425e05efd68fd6bbbfd9a9d3cd4b
Former-commit-id: 3856ce7fc5c5ac85ca26e71da326457f0bb0b2b5
2014-04-02 09:07:22 -05:00
Greg Armendariz
0d0d7bd513
Merge "Issue #2949 Updated scripts Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80" into omaha_14.2.1
...
Former-commit-id: 8d8277705568c04ac37bbe8f09bf7f38f2f0521f
2014-04-01 19:33:30 -05:00
Richard Peter
f99875040c
Issue #2509 : Fix stitched grid notifications
...
Change-Id: Ib4581f8c8d3f3eae15d22601cfc35732acd849a4
Former-commit-id: 861f0c09baa01e191b430bce6699c0f1c95a52d2
2014-04-01 14:44:05 -05:00
Dave Hladky
ede510dd91
Issue #2949 Updated scripts
...
Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80
Former-commit-id: afcfc72329522c2d731a4afe9353632effb9cb23
2014-04-01 12:33:48 -05:00
David Gillingham
70b28b4e1e
Issue #2418 : Re-implement GFE support for pSurge 2.0 data to match A1.
...
Change-Id: I984a4c3e62a1fd5a18610146fa1dd35b9050a8f9
Former-commit-id: e820f7ea4046e42ae1112fe8b1a0f8455dbc997d
2014-03-31 15:49:33 -05:00
Brian.Dyke
3b639347f8
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
...
Former-commit-id: 3b24535fec4e47c1eb0bb845f77dd2f407ecf412
2014-03-27 10:22:26 -04:00
Steve Harris
a7efde7cf4
Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1
...
Former-commit-id: 42a1ec47aa72a882d0f53f94eba3284dccd89b21
2014-03-26 15:51:32 -05:00
