David Friedman
|
f999df6859
|
Merge "ASM #240 - RPS lists delivered by awips2-rcm out of date" into asm_14.2.2
Former-commit-id: a920c5a5e4 [formerly c909746e0e] [formerly a920c5a5e4 [formerly c909746e0e] [formerly a55e851780 [formerly a4c1c5524c31384c3532076ee151fd9a294367d2]]]
Former-commit-id: a55e851780
Former-commit-id: f8c9026f79 [formerly 101f43d875]
Former-commit-id: 421d4a56c8
|
2014-05-16 16:40:38 -05:00 |
|
David Friedman
|
fa63aea622
|
ASM #240 - RPS lists delivered by awips2-rcm out of date
Change-Id: I811bfebab480c5655f7260b85daa36f69e9550eb
Former-commit-id: b462660d75 [formerly caa38ec709] [formerly b462660d75 [formerly caa38ec709] [formerly eab9a6b6d7 [formerly 880c5d7259a5af17f2452fa3bd9f18d852c81d82]]]
Former-commit-id: eab9a6b6d7
Former-commit-id: 81abf8e7d9 [formerly 4efaa47d2d]
Former-commit-id: e576ddde57
|
2014-05-16 21:38:34 +00:00 |
|
David Friedman
|
32524f8d3c
|
ASM #592 - RadarServer does not sent OTRs for RSS product to TDWRs
Change-Id: Iabb354391ea63b6f9c316ea8316fc28128a956f5
Former-commit-id: 404f3af49e [formerly 1503bc4162] [formerly 404f3af49e [formerly 1503bc4162] [formerly 3b69a240c8 [formerly 4fd6bbfba29a39bf125269ab8342b826995e3d86]]]
Former-commit-id: 3b69a240c8
Former-commit-id: ff0f8e731f [formerly b62ac936ba]
Former-commit-id: f8e5e96774
|
2014-05-16 21:34:59 +00:00 |
|
Brian.Dyke
|
1d53f6d304
|
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: f38d0138e6 [formerly 627541512d] [formerly f38d0138e6 [formerly 627541512d] [formerly d3fa10028c [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]]
Former-commit-id: d3fa10028c
Former-commit-id: b0837b4905 [formerly 68f3a0169e]
Former-commit-id: f87775928f
|
2014-05-14 16:08:16 -04:00 |
|
Shawn Hooper
|
5106bea20c
|
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: 3143b15d26 [formerly 2fe0c47c6d] [formerly 3143b15d26 [formerly 2fe0c47c6d] [formerly 24918bda30 [formerly b774242fcff4bf603b82c8a6657e372d8bdc3c19]]]
Former-commit-id: 24918bda30
Former-commit-id: 93977713d5 [formerly e70f2dd6fa]
Former-commit-id: f684b16dcd
|
2014-05-14 14:39:57 -05:00 |
|
Brian.Dyke
|
4cedfadd77
|
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: 5a2e0c7e1b [formerly e95bc87a19] [formerly 5a2e0c7e1b [formerly e95bc87a19] [formerly fb4c7e55b3 [formerly 019c1405290753ed47cecd9a0bb26c220d78d010]]]
Former-commit-id: fb4c7e55b3
Former-commit-id: f9474b087e [formerly 0311366ffb]
Former-commit-id: 3b7a2f1645
|
2014-05-13 11:23:55 -04:00 |
|
Steve Harris
|
82045e2409
|
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: 848519177d [formerly cf62cf4a6e] [formerly 848519177d [formerly cf62cf4a6e] [formerly fc2bf6b45c [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]]
Former-commit-id: fc2bf6b45c
Former-commit-id: 32f255cada [formerly 233922471a]
Former-commit-id: 74a325ce74
|
2014-05-12 16:13:19 -05:00 |
|
Brian.Dyke
|
464cc1a479
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 3aa2f7974b [formerly 386ec058e1] [formerly 3aa2f7974b [formerly 386ec058e1] [formerly 41ba5fc348 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]]
Former-commit-id: 41ba5fc348
Former-commit-id: dc5bc1d2a4 [formerly 2f704c898d]
Former-commit-id: 82663c0ab6
|
2014-05-12 14:07:11 -04:00 |
|
Gang.Zhang
|
6c46d5323e
|
ASM #589 - Fix FFMP Templates generation issue
Change-Id: Ia3715ccb03113f3d2528e516c2568255935f4086
Former-commit-id: fe742a06b9 [formerly f771c8fed4] [formerly fe742a06b9 [formerly f771c8fed4] [formerly 165b953b5c [formerly 560a3cc5ac5e9e059b581294e48e69a9978272e5]]]
Former-commit-id: 165b953b5c
Former-commit-id: b5622c5a5e [formerly c4b32db009]
Former-commit-id: 561169825f
|
2014-05-09 11:51:18 +01:00 |
|
David Gillingham
|
1a3d0a9413
|
Issue #3142: Improve error-handling and logging in CleanupGfeHDF5Storage delta script.
Change-Id: I5c75cfb44654781a53f4588236f5d5d562432615
Former-commit-id: 720993104c [formerly 9ebbf783df] [formerly 720993104c [formerly 9ebbf783df] [formerly 29072aa824 [formerly 920999bda9dda329e71359ab46872130f45d298c]]]
Former-commit-id: 29072aa824
Former-commit-id: 800438edc0 [formerly 1769a52111]
Former-commit-id: 36684955e5
|
2014-05-08 16:51:41 -05:00 |
|
Ben Steffensmeier
|
0d52351d27
|
Issue #3119 Optimize plot rendering.
Former-commit-id: a19a5bf986 [formerly d7cb05fd92] [formerly a19a5bf986 [formerly d7cb05fd92] [formerly 7274d01d64 [formerly 006df5b77f8f09e0b083b3c3e644744653f3d269]]]
Former-commit-id: 7274d01d64
Former-commit-id: bd08996223 [formerly 9701f68f40]
Former-commit-id: 9274027a7a
|
2014-05-07 13:27:48 -05:00 |
|
Brian.Dyke
|
0daec2c83b
|
Merged 13.5.5 -4 into 1412
Former-commit-id: 5a6425b6b0 [formerly f27d1b1efe] [formerly 5a6425b6b0 [formerly f27d1b1efe] [formerly 30bbd2d1cd [formerly 5644361dffaae25c63748a52c23506907210c741]]]
Former-commit-id: 30bbd2d1cd
Former-commit-id: 4155179c42 [formerly 8bf824a625]
Former-commit-id: e0cd200cee
|
2014-05-07 13:07:15 -04:00 |
|
Steve Harris
|
ab4d7cc569
|
Merge branch 'master_14.2.1' (14.2.1-23) into omaha_14.2.1
Former-commit-id: a7211a72f0 [formerly c3509757f0] [formerly a7211a72f0 [formerly c3509757f0] [formerly 0392577b6c [formerly 575adeb94784b32ac0d89e3c4dd506c2fe500266]]]
Former-commit-id: 0392577b6c
Former-commit-id: 8c5eb7774e [formerly 6694af2d5e]
Former-commit-id: 7819c2878f
|
2014-05-07 08:45:41 -05:00 |
|
Ron Anderson
|
2616943080
|
Issue #3129 Change smartInit back to 1 thread on 64-bit
Change-Id: Ie1e17e145d2d88485d91a29e4c74c737e4658038
Former-commit-id: 6c5f1a9ed3 [formerly b43e6d64c3] [formerly 6c5f1a9ed3 [formerly b43e6d64c3] [formerly 32c95e50a7 [formerly f2e15f4ab034f617a3a64814125dfee73b5070ac]]]
Former-commit-id: 32c95e50a7
Former-commit-id: 4a8b1296ea [formerly 85b86bd6e2]
Former-commit-id: cb6ed5a32c
|
2014-05-06 16:01:31 -05:00 |
|
Ron Anderson
|
8d44fdcfb1
|
Issue #3118 Fix gridLocation issues with smartInit databases
Change-Id: I4660418234a5c721381c7986b793d9339c81c603
Former-commit-id: 93320d43c9 [formerly b4815af7f8] [formerly 93320d43c9 [formerly b4815af7f8] [formerly ba0c26edf6 [formerly a4a5522abbb439066acfa3567d0036cf044ef9c7]]]
Former-commit-id: ba0c26edf6
Former-commit-id: 03ac05ef4c [formerly b694dbe2e1]
Former-commit-id: 98c11671d2
|
2014-05-06 15:09:25 -05:00 |
|
Brian.Dyke
|
4f425f71e6
|
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 5461f75e41 [formerly 238e8f7ba1] [formerly 5461f75e41 [formerly 238e8f7ba1] [formerly e3b0b44b71 [formerly c6ba49e1206ed113b57a9fa39f5720ee9b3b979a]]]
Former-commit-id: e3b0b44b71
Former-commit-id: 430543e848 [formerly 43cc1d0b91]
Former-commit-id: fe9aeb1961
|
2014-05-06 11:34:46 -04:00 |
|
Richard Peter
|
e555144511
|
Issue #3102: Fix edexBridge connection leak
Change-Id: Ic0938d31d9ff607249e980c443f98f251501b823
Former-commit-id: 2668f09447 [formerly 501980904d] [formerly 2668f09447 [formerly 501980904d] [formerly b091a8827a [formerly 79c52892667d34abb651a36f7f5bd89f4143ffff]]]
Former-commit-id: b091a8827a
Former-commit-id: 8f1b5b647d [formerly d03c47719f]
Former-commit-id: 87c6348e61
|
2014-05-06 10:32:31 -05:00 |
|
Brian.Dyke
|
9d60a1030a
|
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
Former-commit-id: 0253aa5d7f [formerly 90fecdc71e] [formerly 0253aa5d7f [formerly 90fecdc71e] [formerly 04b8da6f73 [formerly 9adc24725f9bd3499d8f498990413df7718de83e]]]
Former-commit-id: 04b8da6f73
Former-commit-id: 695bf96cef [formerly 884a1d2f2b]
Former-commit-id: 8f6a58d5c5
|
2014-05-06 11:25:15 -04:00 |
|
Sathya.Sankarasubbu
|
47bb8dfc50
|
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: 23102eaa8f [formerly edd543c48d] [formerly 23102eaa8f [formerly edd543c48d] [formerly 1246776d3e [formerly cdeb7f00af695c6d0a79958af23862bd6f3c7ee5]]]
Former-commit-id: 1246776d3e
Former-commit-id: 386091eb78 [formerly 1309866bb8]
Former-commit-id: 6268f58f94
|
2014-05-05 14:33:20 -04:00 |
|
Steve Harris
|
4fe84ba0fd
|
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: 9e149df799 [formerly 6ef3b9f1e5] [formerly 9e149df799 [formerly 6ef3b9f1e5] [formerly 1c8f2f6185 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]]]
Former-commit-id: 1c8f2f6185
Former-commit-id: 927a87b126 [formerly b797b4b1fa]
Former-commit-id: 17318b1870
|
2014-05-05 08:21:02 -05:00 |
|
Shawn.Hooper
|
66e0a8cb74
|
ASM #131 - Additional fix for Lightning Data Decoder
Change-Id: I014a5ce61e495c2339f17ef22f706a3ad1a1ee72
Former-commit-id: faa9f20f84 [formerly 76d4a7ac73] [formerly faa9f20f84 [formerly 76d4a7ac73] [formerly d80a278cb7 [formerly 4bada72eef85bf38522b40526643ebd8bddc9005]]]
Former-commit-id: d80a278cb7
Former-commit-id: 98631b46c8 [formerly b5b0c01eb9]
Former-commit-id: a58a5e95da
|
2014-05-02 12:48:18 -04:00 |
|
David Gillingham
|
da652d1c4a
|
Issue #3105: Ensure ParmManager adds mutable db to internal db list if db is created during initialization.
Change-Id: I85de2a8182abcd0504ceee75076a3c7a72905daf
Former-commit-id: 850eecb1b9 [formerly aa78ed1b69] [formerly 850eecb1b9 [formerly aa78ed1b69] [formerly f368412ef2 [formerly 3d8a23e2e2802d19768de47c61cedb723ec53c8f]]]
Former-commit-id: f368412ef2
Former-commit-id: 3c4ee53300 [formerly b3a859fe39]
Former-commit-id: 64bd4b81dc
|
2014-05-01 16:19:51 -05:00 |
|
Ben Steffensmeier
|
887c707fa5
|
Issue #3100 Time match mosaics on data update.
Former-commit-id: ae1af14ccd [formerly d98bdd64d8] [formerly ae1af14ccd [formerly d98bdd64d8] [formerly 897f67301c [formerly 3655558c91224a57a31cfb25389cee33258e0227]]]
Former-commit-id: 897f67301c
Former-commit-id: c7343cad6b [formerly f4f158f228]
Former-commit-id: cfc21e1717
|
2014-05-01 14:17:33 -05:00 |
|
Qinglu.Lin
|
f8c13f1d3b
|
ASM #123 Zone UGC line not locked
Change-Id: I5eb7ed0bee68599fe4ece0810fe76cb5c794d29c
Former-commit-id: b51bdd9107 [formerly e489658072] [formerly b51bdd9107 [formerly e489658072] [formerly 13c81f9468 [formerly 108895dccefb42c71d0f47b13bfd64591e8dca98]]]
Former-commit-id: 13c81f9468
Former-commit-id: 895a652b4c [formerly caf57dbabe]
Former-commit-id: 1bdf714eba
|
2014-05-01 14:49:27 -04:00 |
|
brian.dyke
|
e6d1e495c4
|
Merge branch 'master_14.2.1-22' into asm_14.2.1
Former-commit-id: 3bf22884a4 [formerly d56fab37e7] [formerly 3bf22884a4 [formerly d56fab37e7] [formerly f3972ce929 [formerly 3666b29a33ca9c758fa87bd387ebd6ad49b97b2a]]]
Former-commit-id: f3972ce929
Former-commit-id: f83a3cda77 [formerly 5f6646adde]
Former-commit-id: 04ef888bac
|
2014-04-30 14:21:11 -04:00 |
|
Ron Anderson
|
6fe1a0d1b7
|
Issue #3097 Fix return type for SmartScript.getGrids()
Change-Id: I13cfa413c5efa32216d08276be57825aff8c0ca0
Former-commit-id: fcfd6e4c00 [formerly 374e8224f1] [formerly fcfd6e4c00 [formerly 374e8224f1] [formerly 613aa1e94a [formerly 1b0bc4789a7166911762d9947552fe54bfe0a137]]]
Former-commit-id: 613aa1e94a
Former-commit-id: 9bcd5d3f4a [formerly 8ba17da4df]
Former-commit-id: 453065268c
|
2014-04-30 17:26:57 +00:00 |
|
Brian.Dyke
|
1aec51b7c4
|
Merge branch 'master_14.2.1' into master_14.2.2
Merge (14.2.1-21 into 14.2.2-5)
Former-commit-id: c5e29cc46a [formerly 35b637c3e2] [formerly c5e29cc46a [formerly 35b637c3e2] [formerly bdda2e9a7a [formerly 9a017e543fc6be9fd0d7b9361bd2226bf2af6211]]]
Former-commit-id: bdda2e9a7a
Former-commit-id: f8c3dca497 [formerly 59f34e3108]
Former-commit-id: 85bf52ef22
|
2014-04-29 12:07:21 -04:00 |
|
Richard Peter
|
aebf46cda5
|
Merge "Issue #3084 Fix NXxNY in master_grib2_lookup, update and comment master_grib2_lookup entries." into omaha_14.2.1
Former-commit-id: b6befe18a6 [formerly a80d2981ba] [formerly b6befe18a6 [formerly a80d2981ba] [formerly ffa75b13ce [formerly f3e957f70651f4c50693ba5296b633659671cf63]]]
Former-commit-id: ffa75b13ce
Former-commit-id: c9e9f6d512 [formerly 3217c86d80]
Former-commit-id: fe10abe4ea
|
2014-04-28 16:40:58 -05:00 |
|
Ben Steffensmeier
|
bd1978f79f
|
Issue #3084 Fix NXxNY in master_grib2_lookup, update and comment master_grib2_lookup entries.
Former-commit-id: 3601d1ff98 [formerly 25e4eee58a] [formerly 3601d1ff98 [formerly 25e4eee58a] [formerly 9985f518b1 [formerly b75445ffea12040487d57bdf248ff3fd48877d8d]]]
Former-commit-id: 9985f518b1
Former-commit-id: 67bc21c089 [formerly bd966b1fa5]
Former-commit-id: 416a504a05
|
2014-04-28 16:26:04 -05:00 |
|
Steve Harris
|
9baca8a8a1
|
Merge branch 'master_14.2.1' (14.2.1-21) into omaha_14.2.1
Former-commit-id: d95f261446 [formerly ccd49b08f0] [formerly d95f261446 [formerly ccd49b08f0] [formerly 88269840b6 [formerly 077a9b72ccb0072634c7c63e241ba50e965b7ed8]]]
Former-commit-id: 88269840b6
Former-commit-id: 915ba9f80c [formerly 45d80b8b07]
Former-commit-id: e5b5765c65
|
2014-04-28 15:26:43 -05:00 |
|
brian.dyke
|
72895ea055
|
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: ddfc734c26 [formerly 6cc1c166f9] [formerly ddfc734c26 [formerly 6cc1c166f9] [formerly cbe7b3ec72 [formerly 2cd6c57e232b4f4a2a24c54d74e7ce9f08351b79]]]
Former-commit-id: cbe7b3ec72
Former-commit-id: 40615bd734 [formerly 149058069f]
Former-commit-id: 3df3d28a8b
|
2014-04-28 14:06:15 -04:00 |
|
Shawn.Hooper
|
490c371e5a
|
Merge "ASM #577 - Removed com.raytheon.viz.dataaccess.feature plugin from p2-build.xml" into asm_14.2.1
Former-commit-id: 54ef1b1ca7 [formerly 4d6af11742] [formerly 54ef1b1ca7 [formerly 4d6af11742] [formerly 57a9e0d586 [formerly 9d7862fb7e7f4c3a16ba42b65e9111087dc0c8b3]]]
Former-commit-id: 57a9e0d586
Former-commit-id: 79b8c0aeb0 [formerly 7b498a3be0]
Former-commit-id: e58796bc1f
|
2014-04-28 09:37:28 -05:00 |
|
Shawn.Hooper
|
b8a3b168d2
|
ASM #577 - Removed com.raytheon.viz.dataaccess.feature plugin from p2-build.xml
Change-Id: I505a9cc943b7ab09b430ca826efa1ee81f08a930
Former-commit-id: 9182d8428a [formerly a3e52e8cea] [formerly 9182d8428a [formerly a3e52e8cea] [formerly b4597dc021 [formerly 968a136e81b6247a03af9b78643c388d21a4218b]]]
Former-commit-id: b4597dc021
Former-commit-id: 1e4aeb5842 [formerly eeaba5539f]
Former-commit-id: 947b31eb6e
|
2014-04-25 10:40:43 -04:00 |
|
Shawn.Hooper
|
bfee40353b
|
ASM #224 - WarnGen: OB13.5.2 Template Errors
Change-Id: I99339c0ea3d0110ca855dd3db82b41b28a32dd6d
Former-commit-id: 8ffe88d856 [formerly 09204a381c] [formerly 8ffe88d856 [formerly 09204a381c] [formerly 79db962a88 [formerly c6fffaf265dc184b7692a43bb461572f54b8190a]]]
Former-commit-id: 79db962a88
Former-commit-id: 896fe0691e [formerly c49eee4928]
Former-commit-id: ceb1c711ea
|
2014-04-25 10:19:48 -04:00 |
|
Steve Harris
|
a8a16c5c27
|
Merge branch 'master_14.2.1' (14.2.1-19,20) into omaha_14.2.1
Change-Id: Ib48a2c15e266cd012aba975c25ef094b828a0f68
Former-commit-id: 066515b7c5 [formerly 4f9620bb04] [formerly 066515b7c5 [formerly 4f9620bb04] [formerly 18e79fe08d [formerly 749922901de5a57c7344f29def844a5ecf90304a]]]
Former-commit-id: 18e79fe08d
Former-commit-id: 0a58f699aa [formerly 22d24534e4]
Former-commit-id: 26475d2081
|
2014-04-25 09:09:38 -05:00 |
|
Brian.Dyke
|
d6e931dd87
|
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
Former-commit-id: a5c9321a8d [formerly a61af3e6d3] [formerly a5c9321a8d [formerly a61af3e6d3] [formerly ac74878ae2 [formerly 48184880ce65a4899a4ed989f2d3f8082771047f]]]
Former-commit-id: ac74878ae2
Former-commit-id: ae4aea9abf [formerly c21644c87f]
Former-commit-id: b3a733036c
|
2014-04-24 13:28:31 -04:00 |
|
Brian.Dyke
|
378332d8bb
|
Merged 13.5.5 -2 and -3 into 1412
Former-commit-id: eff27f5504 [formerly a19f01c620] [formerly eff27f5504 [formerly a19f01c620] [formerly e82fc8f89c [formerly 4e921dbeab89e61635144b441ae0015155376c59]]]
Former-commit-id: e82fc8f89c
Former-commit-id: af2d8f5bad [formerly df6f06bef5]
Former-commit-id: 0fa669acce
|
2014-04-24 13:01:50 -04:00 |
|
Brian.Dyke
|
2161c569ea
|
Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: 88d44a3129 [formerly 2a4fe3dbae] [formerly 88d44a3129 [formerly 2a4fe3dbae] [formerly a7c9ddc05e [formerly 64ca88d2ed7de18f9ed1f57edd2286bbc552135f]]]
Former-commit-id: a7c9ddc05e
Former-commit-id: 953236aad8 [formerly 911c0c6c17]
Former-commit-id: 26cb172a04
|
2014-04-23 14:05:50 -04:00 |
|
Ron Anderson
|
0c7c52095e
|
Issue #3050 Fix SaveAsciiGridsHandler to get IFPServer instance based on site in the ParmID
Change-Id: Id2146e07f4e6103c9c96f2b09f0bae5980747052
Former-commit-id: db978fff9a [formerly b12a6cd828] [formerly db978fff9a [formerly b12a6cd828] [formerly 859d709a03 [formerly 6f141288cae462aac8c1ea8c77dd7f88a33c382a]]]
Former-commit-id: 859d709a03
Former-commit-id: 57e277dc69 [formerly e8a07a2ebe]
Former-commit-id: 51bb78561c
|
2014-04-22 14:38:54 -05:00 |
|
Zhidong.Hao
|
914803ff7a
|
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: I6176b14c5451ebd4ee520c2e5a13157457009303
Former-commit-id: f16936223a [formerly e1d5aa284d] [formerly f16936223a [formerly e1d5aa284d] [formerly 0177756f97 [formerly 4e7edc8ebbd79c16d6eb725c8d11d05f20424ed4]]]
Former-commit-id: 0177756f97
Former-commit-id: d6edd56d34 [formerly 358e7b2b54]
Former-commit-id: 7d00166b10
|
2014-04-22 14:31:14 -04:00 |
|
Dave Hladky
|
4ce5dfcd92
|
Issue #3012 Various fixes.
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 91bd735d47 [formerly 61fc2fea51] [formerly 91bd735d47 [formerly 61fc2fea51] [formerly 45059e722a [formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]]]
Former-commit-id: 45059e722a
Former-commit-id: 117a3953af [formerly ae84d2991e]
Former-commit-id: 6c83fd0929
|
2014-04-21 12:26:47 -05:00 |
|
Richard Peter
|
8768811fde
|
Merge "Issue #3011 Fixed slot cleanup" into omaha_14.2.1
Former-commit-id: dc41da4a65 [formerly 9dc957f1a1] [formerly dc41da4a65 [formerly 9dc957f1a1] [formerly 1e33125cb7 [formerly 8b8523aa60fa649a3208a5f3ae7dcb1fded3f0e6]]]
Former-commit-id: 1e33125cb7
Former-commit-id: 5dd87d4b5d [formerly 4e71d9e099]
Former-commit-id: 68df58fb03
|
2014-04-18 15:15:13 -05:00 |
|
Benjamin Phillippe
|
160f48406a
|
Issue #3011 Fixed slot cleanup
Change-Id: I346b0e2c17bcc0f3bcf946772694c127e8baffa5
Former-commit-id: b0d162ccba [formerly b2686e46cf] [formerly b0d162ccba [formerly b2686e46cf] [formerly b86fae838f [formerly 4ac3c1a55fe7e99d7e9049ffb401b8ea3caf7983]]]
Former-commit-id: b86fae838f
Former-commit-id: 1d600c8559 [formerly d8408a9b3f]
Former-commit-id: 201f25eab3
|
2014-04-18 15:10:46 -05:00 |
|
Brian.Dyke
|
ddee08368a
|
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 3b90abdf7a [formerly 880329e4ae] [formerly 3b90abdf7a [formerly 880329e4ae] [formerly 9943a331c3 [formerly d07d06f5e4b3c1dbf7d165ad97b9b114a4819011]]]
Former-commit-id: 9943a331c3
Former-commit-id: 2c8e6ec2fc [formerly 62c2a8b843]
Former-commit-id: 989b873f6e
|
2014-04-18 07:53:10 -04:00 |
|
Brian.Dyke
|
8275f3907f
|
Merge branch 'asm_14.2.2' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.2
Former-commit-id: 53ce26a9b6 [formerly 1aec3b3698] [formerly 53ce26a9b6 [formerly 1aec3b3698] [formerly 645fe64a4a [formerly 178acb792036869e903beea636c7216e1d3a4f58]]]
Former-commit-id: 645fe64a4a
Former-commit-id: 66974e17b9 [formerly 4eb3317f80]
Former-commit-id: 59cbfdf093
|
2014-04-17 14:42:44 -04:00 |
|
Brian.Dyke
|
de500c093f
|
Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: 9df6fb2d4d [formerly 12a482e1d7] [formerly 9df6fb2d4d [formerly 12a482e1d7] [formerly b8829139a2 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]]
Former-commit-id: b8829139a2
Former-commit-id: 6f35818917 [formerly 0ea7c51ad7]
Former-commit-id: a925ba6219
|
2014-04-17 14:42:35 -04:00 |
|
Nate Jensen
|
f607630d72
|
Issue #3018 addressing code review comments
Former-commit-id: 54951100af [formerly e327f5e0bf] [formerly 54951100af [formerly e327f5e0bf] [formerly 8ba6b2722d [formerly 85d9dd0158ab873e1e9b76805853c712bb0c7c2c]]]
Former-commit-id: 8ba6b2722d
Former-commit-id: 81f8f6f328 [formerly 8b6650c898]
Former-commit-id: 3737ad85b6
|
2014-04-17 09:28:47 -05:00 |
|
Ron Anderson
|
d704f90445
|
Merge "Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock" into omaha_14.2.1
Former-commit-id: 85a1f55ea0 [formerly f9a393172f] [formerly 85a1f55ea0 [formerly f9a393172f] [formerly 1ba72371be [formerly 6813b32786289503950322c02e32803299566c5d]]]
Former-commit-id: 1ba72371be
Former-commit-id: 2139c2308e [formerly 7d09397faa]
Former-commit-id: 94f852cda7
|
2014-04-16 18:02:11 -05:00 |
|
Nate Jensen
|
de32624fdf
|
Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock
Former-commit-id: 781ec3ecd6 [formerly a085b71c81] [formerly 781ec3ecd6 [formerly a085b71c81] [formerly c362af04f3 [formerly 7384a2d32ef554362a0693038e9b60a589afb86a]]]
Former-commit-id: c362af04f3
Former-commit-id: 1a40bc4824 [formerly e1caa66625]
Former-commit-id: e4aeb8394d
|
2014-04-16 17:25:09 -05:00 |
|
Nate Jensen
|
64e7ac4225
|
Issue #3039 fix ifpImage class cast exception
Former-commit-id: a5edace073 [formerly 2b6db445c0] [formerly a5edace073 [formerly 2b6db445c0] [formerly 31fb61e824 [formerly a2fd849c603aebacce09662557bf1f008d379982]]]
Former-commit-id: 31fb61e824
Former-commit-id: 19f0be6afc [formerly a1dd7f24fa]
Former-commit-id: 7e7bbfd784
|
2014-04-16 16:17:05 -05:00 |
|