Dave Hladky
783cd9e308
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
d3fa10028c
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
24918bda30
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
15366714ed
Issue #3168 Move retrieval distribution to correct DD RPM
...
Former-commit-id: 228ef1ceb7337fa38c370c3218d1c32b4f1302fb
2014-05-14 11:12:55 -05:00
Steve Harris
f5bc8e598b
Merge branch 'master_14.2.2' (14.2.2-8) into omaha_14.2.2
...
Former-commit-id: a2f35d52b5ffbf2fee8bd953eb795810972e4e53
2014-05-13 15:32:39 -05:00
Steve Harris
70b95c7636
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
fb4c7e55b3
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
fc2bf6b45c
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
41ba5fc348
CM-MERGE:OB13.5.5-5 into 14.1.2
...
Former-commit-id: 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3
2014-05-12 14:07:11 -04:00
Ben Steffensmeier
102d560686
Issue #2289 Fix TempOfTe at small pressure values.
...
Former-commit-id: a114bf15018ab86ec1511c13704fd6e1e3feed99
2014-05-12 10:11:34 -05:00
Gang.Zhang
165b953b5c
ASM #589 - Fix FFMP Templates generation issue
...
Change-Id: Ia3715ccb03113f3d2528e516c2568255935f4086
Former-commit-id: 560a3cc5ac5e9e059b581294e48e69a9978272e5
2014-05-09 11:51:18 +01:00
David Gillingham
29072aa824
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
7274d01d64
Issue #3119 Optimize plot rendering.
...
Former-commit-id: 006df5b77f8f09e0b083b3c3e644744653f3d269
2014-05-07 13:27:48 -05:00
Brian.Dyke
30bbd2d1cd
Merged 13.5.5 -4 into 1412
...
Former-commit-id: 5644361dffaae25c63748a52c23506907210c741
2014-05-07 13:07:15 -04:00
Steve Harris
0392577b6c
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
32c95e50a7
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
ba0c26edf6
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
e3b0b44b71
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
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
Sathya.Sankarasubbu
1246776d3e
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
c4bb2efdf4
Merge branch 'master_14.2.2' (14.2.2-7) into omaha_14.2.2
...
Former-commit-id: a0cde99cddfb1f1f397814ec045c8e5503210867
2014-05-05 09:11:58 -05: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
Qinglu.Lin
13c81f9468
ASM #123 Zone UGC line not locked
...
Change-Id: I5eb7ed0bee68599fe4ece0810fe76cb5c794d29c
Former-commit-id: 108895dccefb42c71d0f47b13bfd64591e8dca98
2014-05-01 14:49:27 -04: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
Steve Harris
29905d5489
Merge branch 'master_14.2.2' (14.2.2-6) into omaha_14.2.2
...
Former-commit-id: 260bc939e0bbb957cc7d95c71723f72211cde533
2014-04-29 16:03:25 -05:00
Brian.Dyke
bdda2e9a7a
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
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
Steve Harris
5742ac326a
Merge branch 'master_14.2.2' (14.2.2-5) into omaha_14.2.2
...
Former-commit-id: 6fad1517d1bc35108d09af988d7a94cdc3f0f822
2014-04-25 12:12:10 -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
Brian.Dyke
a7c9ddc05e
Merge branch 'master_14.2.1' into master_14.2.2
...
Former-commit-id: 64ca88d2ed7de18f9ed1f57edd2286bbc552135f
2014-04-23 14:05: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
Steve Harris
5b9cbd8ce4
Merge branch 'master_14.2.2' (14.2.2-4) into omaha_14.2.2
...
Former-commit-id: 26e51b0d60276597388fb3ad49fed4dddaa8a2ca
2014-04-18 14:38:54 -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
