Brian.Dyke
3aa2f7974b
CM-MERGE:OB13.5.5-5 into 14.1.2
...
Former-commit-id: 41ba5fc348386ec058e1
2014-05-12 14:07:11 -04:00
Ben Steffensmeier
d051416c76
Issue #2289 Fix TempOfTe at small pressure values.
...
Former-commit-id: 102d5606862754326906
2014-05-12 10:11:34 -05:00
Gang.Zhang
fe742a06b9
ASM #589 - Fix FFMP Templates generation issue
...
Change-Id: Ia3715ccb03113f3d2528e516c2568255935f4086
Former-commit-id: 165b953b5cf771c8fed4
2014-05-09 11:51:18 +01:00
David Gillingham
720993104c
Issue #3142 : Improve error-handling and logging in CleanupGfeHDF5Storage delta script.
...
Change-Id: I5c75cfb44654781a53f4588236f5d5d562432615
Former-commit-id: 29072aa8249ebbf783df
2014-05-08 16:51:41 -05:00
Ben Steffensmeier
a19a5bf986
Issue #3119 Optimize plot rendering.
...
Former-commit-id: 7274d01d64d7cb05fd92
2014-05-07 13:27:48 -05:00
Brian.Dyke
5a6425b6b0
Merged 13.5.5 -4 into 1412
...
Former-commit-id: 30bbd2d1cdf27d1b1efe
2014-05-07 13:07:15 -04:00
Steve Harris
a7211a72f0
Merge branch 'master_14.2.1' (14.2.1-23) into omaha_14.2.1
...
Former-commit-id: 0392577b6cc3509757f0
2014-05-07 08:45:41 -05:00
Ron Anderson
6c5f1a9ed3
Issue #3129 Change smartInit back to 1 thread on 64-bit
...
Change-Id: Ie1e17e145d2d88485d91a29e4c74c737e4658038
Former-commit-id: 32c95e50a7b43e6d64c3
2014-05-06 16:01:31 -05:00
Ron Anderson
93320d43c9
Issue #3118 Fix gridLocation issues with smartInit databases
...
Change-Id: I4660418234a5c721381c7986b793d9339c81c603
Former-commit-id: ba0c26edf6b4815af7f8
2014-05-06 15:09:25 -05:00
Brian.Dyke
5461f75e41
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: e3b0b44b71238e8f7ba1
2014-05-06 11:34:46 -04:00
Richard Peter
2668f09447
Issue #3102 : Fix edexBridge connection leak
...
Change-Id: Ic0938d31d9ff607249e980c443f98f251501b823
Former-commit-id: b091a8827a501980904d
2014-05-06 10:32:31 -05:00
Brian.Dyke
0253aa5d7f
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
...
Former-commit-id: 04b8da6f7390fecdc71e
2014-05-06 11:25:15 -04:00
Sathya.Sankarasubbu
23102eaa8f
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: 1246776d3eedd543c48d
2014-05-05 14:33:20 -04:00
Steve Harris
030c3c1eb6
Merge branch 'master_14.2.2' (14.2.2-7) into omaha_14.2.2
...
Former-commit-id: c4bb2efdf4e6a7566eed
2014-05-05 09:11:58 -05:00
Steve Harris
9e149df799
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: 1c8f2f61856ef3b9f1e5
2014-05-05 08:21:02 -05:00
Shawn.Hooper
faa9f20f84
ASM #131 - Additional fix for Lightning Data Decoder
...
Change-Id: I014a5ce61e495c2339f17ef22f706a3ad1a1ee72
Former-commit-id: d80a278cb776d4a7ac73
2014-05-02 12:48:18 -04:00
David Gillingham
850eecb1b9
Issue #3105 : Ensure ParmManager adds mutable db to internal db list if db is created during initialization.
...
Change-Id: I85de2a8182abcd0504ceee75076a3c7a72905daf
Former-commit-id: f368412ef2aa78ed1b69
2014-05-01 16:19:51 -05:00
Ben Steffensmeier
ae1af14ccd
Issue #3100 Time match mosaics on data update.
...
Former-commit-id: 897f67301cd98bdd64d8
2014-05-01 14:17:33 -05:00
Qinglu.Lin
b51bdd9107
ASM #123 Zone UGC line not locked
...
Change-Id: I5eb7ed0bee68599fe4ece0810fe76cb5c794d29c
Former-commit-id: 13c81f9468e489658072
2014-05-01 14:49:27 -04:00
brian.dyke
3bf22884a4
Merge branch 'master_14.2.1-22' into asm_14.2.1
...
Former-commit-id: f3972ce929d56fab37e7
2014-04-30 14:21:11 -04:00
Ron Anderson
fcfd6e4c00
Issue #3097 Fix return type for SmartScript.getGrids()
...
Change-Id: I13cfa413c5efa32216d08276be57825aff8c0ca0
Former-commit-id: 613aa1e94a374e8224f1
2014-04-30 17:26:57 +00:00
Steve Harris
e5d5882125
Merge branch 'master_14.2.2' (14.2.2-6) into omaha_14.2.2
...
Former-commit-id: 29905d5489d5c1663224
2014-04-29 16:03:25 -05:00
Brian.Dyke
c5e29cc46a
Merge branch 'master_14.2.1' into master_14.2.2
...
Merge (14.2.1-21 into 14.2.2-5)
Former-commit-id: bdda2e9a7a35b637c3e2
2014-04-29 12:07:21 -04:00
Richard Peter
b6befe18a6
Merge "Issue #3084 Fix NXxNY in master_grib2_lookup, update and comment master_grib2_lookup entries." into omaha_14.2.1
...
Former-commit-id: ffa75b13cea80d2981ba
2014-04-28 16:40:58 -05:00
Ben Steffensmeier
3601d1ff98
Issue #3084 Fix NXxNY in master_grib2_lookup, update and comment master_grib2_lookup entries.
...
Former-commit-id: 9985f518b125e4eee58a
2014-04-28 16:26:04 -05:00
Steve Harris
d95f261446
Merge branch 'master_14.2.1' (14.2.1-21) into omaha_14.2.1
...
Former-commit-id: 88269840b6ccd49b08f0
2014-04-28 15:26:43 -05:00
brian.dyke
ddfc734c26
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: cbe7b3ec726cc1c166f9
2014-04-28 14:06:15 -04:00
Shawn.Hooper
54ef1b1ca7
Merge "ASM #577 - Removed com.raytheon.viz.dataaccess.feature plugin from p2-build.xml" into asm_14.2.1
...
Former-commit-id: 57a9e0d5864d6af11742
2014-04-28 09:37:28 -05:00
Steve Harris
82afa73cc2
Merge branch 'master_14.2.2' (14.2.2-5) into omaha_14.2.2
...
Former-commit-id: 5742ac326a0d474430cc
2014-04-25 12:12:10 -05:00
Shawn.Hooper
9182d8428a
ASM #577 - Removed com.raytheon.viz.dataaccess.feature plugin from p2-build.xml
...
Change-Id: I505a9cc943b7ab09b430ca826efa1ee81f08a930
Former-commit-id: b4597dc021a3e52e8cea
2014-04-25 10:40:43 -04:00
Shawn.Hooper
8ffe88d856
ASM #224 - WarnGen: OB13.5.2 Template Errors
...
Change-Id: I99339c0ea3d0110ca855dd3db82b41b28a32dd6d
Former-commit-id: 79db962a8809204a381c
2014-04-25 10:19:48 -04:00
Steve Harris
066515b7c5
Merge branch 'master_14.2.1' (14.2.1-19,20) into omaha_14.2.1
...
Change-Id: Ib48a2c15e266cd012aba975c25ef094b828a0f68
Former-commit-id: 18e79fe08d4f9620bb04
2014-04-25 09:09:38 -05:00
Brian.Dyke
a5c9321a8d
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
...
Former-commit-id: ac74878ae2a61af3e6d3
2014-04-24 13:28:31 -04:00
Brian.Dyke
eff27f5504
Merged 13.5.5 -2 and -3 into 1412
...
Former-commit-id: e82fc8f89ca19f01c620
2014-04-24 13:01:50 -04:00
Brian.Dyke
88d44a3129
Merge branch 'master_14.2.1' into master_14.2.2
...
Former-commit-id: a7c9ddc05e2a4fe3dbae
2014-04-23 14:05:50 -04:00
Ron Anderson
db978fff9a
Issue #3050 Fix SaveAsciiGridsHandler to get IFPServer instance based on site in the ParmID
...
Change-Id: Id2146e07f4e6103c9c96f2b09f0bae5980747052
Former-commit-id: 859d709a03b12a6cd828
2014-04-22 14:38:54 -05:00
Zhidong.Hao
f16936223a
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
...
Change-Id: I6176b14c5451ebd4ee520c2e5a13157457009303
Former-commit-id: 0177756f97e1d5aa284d
2014-04-22 14:31:14 -04:00
Dave Hladky
91bd735d47
Issue #3012 Various fixes.
...
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 45059e722a61fc2fea51
2014-04-21 12:26:47 -05:00
Richard Peter
dc41da4a65
Merge "Issue #3011 Fixed slot cleanup" into omaha_14.2.1
...
Former-commit-id: 1e33125cb79dc957f1a1
2014-04-18 15:15:13 -05:00
Benjamin Phillippe
b0d162ccba
Issue #3011 Fixed slot cleanup
...
Change-Id: I346b0e2c17bcc0f3bcf946772694c127e8baffa5
Former-commit-id: b86fae838fb2686e46cf
2014-04-18 15:10:46 -05:00
Steve Harris
159b520938
Merge branch 'master_14.2.2' (14.2.2-4) into omaha_14.2.2
...
Former-commit-id: 5b9cbd8ce406cf9aa40f
2014-04-18 14:38:54 -05:00
Brian.Dyke
3b90abdf7a
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: 9943a331c3880329e4ae
2014-04-18 07:53:10 -04:00
Brian.Dyke
53ce26a9b6
Merge branch 'asm_14.2.2' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.2
...
Former-commit-id: 645fe64a4a1aec3b3698
2014-04-17 14:42:44 -04:00
Brian.Dyke
9df6fb2d4d
Merged 14.2.1 -17, -18 into 1422-3
...
Former-commit-id: b8829139a212a482e1d7
2014-04-17 14:42:35 -04:00
Nate Jensen
54951100af
Issue #3018 addressing code review comments
...
Former-commit-id: 8ba6b2722de327f5e0bf
2014-04-17 09:28:47 -05:00
Ron Anderson
85a1f55ea0
Merge "Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock" into omaha_14.2.1
...
Former-commit-id: 1ba72371bef9a393172f
2014-04-16 18:02:11 -05:00
Nate Jensen
781ec3ecd6
Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock
...
Former-commit-id: c362af04f3a085b71c81
2014-04-16 17:25:09 -05:00
Nate Jensen
a5edace073
Issue #3039 fix ifpImage class cast exception
...
Former-commit-id: 31fb61e8242b6db445c0
2014-04-16 16:17:05 -05:00
Brian.Dyke
65ad515a6e
Merged 13.5.5-1 into 1412
...
Former-commit-id: 35ad867281188d84cc87
2014-04-16 12:09:12 -04:00
Nate Jensen
9ebedf0b98
Merge "Issue #3017 Update SatSpatialFactory to have more specific methods." into omaha_14.2.1
...
Former-commit-id: e0ae9e5f8fd121f07e76
2014-04-16 08:41:54 -05:00
