Commit graph

4904 commits

Author SHA1 Message Date
David Friedman
a13190aeb9 ASM #240 - RPS lists delivered by awips2-rcm out of date
Change-Id: I811bfebab480c5655f7260b85daa36f69e9550eb

Former-commit-id: eab9a6b6d7 [formerly caa38ec709 [formerly 880c5d7259a5af17f2452fa3bd9f18d852c81d82]]
Former-commit-id: caa38ec709
Former-commit-id: b462660d75
2014-05-16 21:38:34 +00:00
Brian.Dyke
8c0709798d 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: d3fa10028c [formerly 627541512d [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]
Former-commit-id: 627541512d
Former-commit-id: f38d0138e6
2014-05-14 16:08:16 -04:00
Shawn Hooper
183109f238 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: 24918bda30 [formerly 2fe0c47c6d [formerly b774242fcff4bf603b82c8a6657e372d8bdc3c19]]
Former-commit-id: 2fe0c47c6d
Former-commit-id: 3143b15d26
2014-05-14 14:39:57 -05:00
Brian.Dyke
e705786d12 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: fb4c7e55b3 [formerly e95bc87a19 [formerly 019c1405290753ed47cecd9a0bb26c220d78d010]]
Former-commit-id: e95bc87a19
Former-commit-id: 5a2e0c7e1b
2014-05-13 11:23:55 -04:00
Steve Harris
343444715e 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: fc2bf6b45c [formerly cf62cf4a6e [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]
Former-commit-id: cf62cf4a6e
Former-commit-id: 848519177d
2014-05-12 16:13:19 -05:00
Brian.Dyke
82ce970ad6 CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 41ba5fc348 [formerly 386ec058e1 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]
Former-commit-id: 386ec058e1
Former-commit-id: 3aa2f7974b
2014-05-12 14:07:11 -04:00
Gang.Zhang
9a1ba6435f ASM #589 - Fix FFMP Templates generation issue
Change-Id: Ia3715ccb03113f3d2528e516c2568255935f4086

Former-commit-id: 165b953b5c [formerly f771c8fed4 [formerly 560a3cc5ac5e9e059b581294e48e69a9978272e5]]
Former-commit-id: f771c8fed4
Former-commit-id: fe742a06b9
2014-05-09 11:51:18 +01:00
David Gillingham
39266d563f Issue #3142: Improve error-handling and logging in CleanupGfeHDF5Storage delta script.
Change-Id: I5c75cfb44654781a53f4588236f5d5d562432615

Former-commit-id: 29072aa824 [formerly 9ebbf783df [formerly 920999bda9dda329e71359ab46872130f45d298c]]
Former-commit-id: 9ebbf783df
Former-commit-id: 720993104c
2014-05-08 16:51:41 -05:00
Ben Steffensmeier
4ae6884a41 Issue #3119 Optimize plot rendering.
Former-commit-id: 7274d01d64 [formerly d7cb05fd92 [formerly 006df5b77f8f09e0b083b3c3e644744653f3d269]]
Former-commit-id: d7cb05fd92
Former-commit-id: a19a5bf986
2014-05-07 13:27:48 -05:00
Brian.Dyke
dd9f977f4f Merged 13.5.5 -4 into 1412
Former-commit-id: 30bbd2d1cd [formerly f27d1b1efe [formerly 5644361dffaae25c63748a52c23506907210c741]]
Former-commit-id: f27d1b1efe
Former-commit-id: 5a6425b6b0
2014-05-07 13:07:15 -04:00
Steve Harris
bffbcf61b8 Merge branch 'master_14.2.1' (14.2.1-23) into omaha_14.2.1
Former-commit-id: 0392577b6c [formerly c3509757f0 [formerly 575adeb94784b32ac0d89e3c4dd506c2fe500266]]
Former-commit-id: c3509757f0
Former-commit-id: a7211a72f0
2014-05-07 08:45:41 -05:00
Ron Anderson
5c0b04b00f Issue #3129 Change smartInit back to 1 thread on 64-bit
Change-Id: Ie1e17e145d2d88485d91a29e4c74c737e4658038

Former-commit-id: 32c95e50a7 [formerly b43e6d64c3 [formerly f2e15f4ab034f617a3a64814125dfee73b5070ac]]
Former-commit-id: b43e6d64c3
Former-commit-id: 6c5f1a9ed3
2014-05-06 16:01:31 -05:00
Ron Anderson
32a23a5d03 Issue #3118 Fix gridLocation issues with smartInit databases
Change-Id: I4660418234a5c721381c7986b793d9339c81c603

Former-commit-id: ba0c26edf6 [formerly b4815af7f8 [formerly a4a5522abbb439066acfa3567d0036cf044ef9c7]]
Former-commit-id: b4815af7f8
Former-commit-id: 93320d43c9
2014-05-06 15:09:25 -05:00
Brian.Dyke
341e5c86c6 Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: e3b0b44b71 [formerly 238e8f7ba1 [formerly c6ba49e1206ed113b57a9fa39f5720ee9b3b979a]]
Former-commit-id: 238e8f7ba1
Former-commit-id: 5461f75e41
2014-05-06 11:34:46 -04:00
Richard Peter
1a2d875bd0 Issue #3102: Fix edexBridge connection leak
Change-Id: Ic0938d31d9ff607249e980c443f98f251501b823

Former-commit-id: b091a8827a [formerly 501980904d [formerly 79c52892667d34abb651a36f7f5bd89f4143ffff]]
Former-commit-id: 501980904d
Former-commit-id: 2668f09447
2014-05-06 10:32:31 -05:00
Brian.Dyke
c6f84d017a Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
Former-commit-id: 04b8da6f73 [formerly 90fecdc71e [formerly 9adc24725f9bd3499d8f498990413df7718de83e]]
Former-commit-id: 90fecdc71e
Former-commit-id: 0253aa5d7f
2014-05-06 11:25:15 -04:00
Sathya.Sankarasubbu
faa48d1691 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: 1246776d3e [formerly edd543c48d [formerly cdeb7f00af695c6d0a79958af23862bd6f3c7ee5]]
Former-commit-id: edd543c48d
Former-commit-id: 23102eaa8f
2014-05-05 14:33:20 -04:00
Steve Harris
010301045d 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: 1c8f2f6185 [formerly 6ef3b9f1e5 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]]
Former-commit-id: 6ef3b9f1e5
Former-commit-id: 9e149df799
2014-05-05 08:21:02 -05:00
Shawn.Hooper
14d7d0d9c1 ASM #131 - Additional fix for Lightning Data Decoder
Change-Id: I014a5ce61e495c2339f17ef22f706a3ad1a1ee72

Former-commit-id: d80a278cb7 [formerly 76d4a7ac73 [formerly 4bada72eef85bf38522b40526643ebd8bddc9005]]
Former-commit-id: 76d4a7ac73
Former-commit-id: faa9f20f84
2014-05-02 12:48:18 -04:00
David Gillingham
f8e5a17f3f Issue #3105: Ensure ParmManager adds mutable db to internal db list if db is created during initialization.
Change-Id: I85de2a8182abcd0504ceee75076a3c7a72905daf

Former-commit-id: f368412ef2 [formerly aa78ed1b69 [formerly 3d8a23e2e2802d19768de47c61cedb723ec53c8f]]
Former-commit-id: aa78ed1b69
Former-commit-id: 850eecb1b9
2014-05-01 16:19:51 -05:00
Ben Steffensmeier
e712f37076 Issue #3100 Time match mosaics on data update.
Former-commit-id: 897f67301c [formerly d98bdd64d8 [formerly 3655558c91224a57a31cfb25389cee33258e0227]]
Former-commit-id: d98bdd64d8
Former-commit-id: ae1af14ccd
2014-05-01 14:17:33 -05:00
Qinglu.Lin
deb29531b6 ASM #123 Zone UGC line not locked
Change-Id: I5eb7ed0bee68599fe4ece0810fe76cb5c794d29c

Former-commit-id: 13c81f9468 [formerly e489658072 [formerly 108895dccefb42c71d0f47b13bfd64591e8dca98]]
Former-commit-id: e489658072
Former-commit-id: b51bdd9107
2014-05-01 14:49:27 -04:00
brian.dyke
71623932e4 Merge branch 'master_14.2.1-22' into asm_14.2.1
Former-commit-id: f3972ce929 [formerly d56fab37e7 [formerly 3666b29a33ca9c758fa87bd387ebd6ad49b97b2a]]
Former-commit-id: d56fab37e7
Former-commit-id: 3bf22884a4
2014-04-30 14:21:11 -04:00
Ron Anderson
fa1c34691c Issue #3097 Fix return type for SmartScript.getGrids()
Change-Id: I13cfa413c5efa32216d08276be57825aff8c0ca0

Former-commit-id: 613aa1e94a [formerly 374e8224f1 [formerly 1b0bc4789a7166911762d9947552fe54bfe0a137]]
Former-commit-id: 374e8224f1
Former-commit-id: fcfd6e4c00
2014-04-30 17:26:57 +00:00
Brian.Dyke
7364553aea Merge branch 'master_14.2.1' into master_14.2.2
Merge (14.2.1-21 into 14.2.2-5)


Former-commit-id: bdda2e9a7a [formerly 35b637c3e2 [formerly 9a017e543fc6be9fd0d7b9361bd2226bf2af6211]]
Former-commit-id: 35b637c3e2
Former-commit-id: c5e29cc46a
2014-04-29 12:07:21 -04:00
Richard Peter
cd3b0e9e00 Merge "Issue #3084 Fix NXxNY in master_grib2_lookup, update and comment master_grib2_lookup entries." into omaha_14.2.1
Former-commit-id: ffa75b13ce [formerly a80d2981ba [formerly f3e957f70651f4c50693ba5296b633659671cf63]]
Former-commit-id: a80d2981ba
Former-commit-id: b6befe18a6
2014-04-28 16:40:58 -05:00
Ben Steffensmeier
1718bc0c82 Issue #3084 Fix NXxNY in master_grib2_lookup, update and comment master_grib2_lookup entries.
Former-commit-id: 9985f518b1 [formerly 25e4eee58a [formerly b75445ffea12040487d57bdf248ff3fd48877d8d]]
Former-commit-id: 25e4eee58a
Former-commit-id: 3601d1ff98
2014-04-28 16:26:04 -05:00
Steve Harris
de988c3872 Merge branch 'master_14.2.1' (14.2.1-21) into omaha_14.2.1
Former-commit-id: 88269840b6 [formerly ccd49b08f0 [formerly 077a9b72ccb0072634c7c63e241ba50e965b7ed8]]
Former-commit-id: ccd49b08f0
Former-commit-id: d95f261446
2014-04-28 15:26:43 -05:00
brian.dyke
7194790129 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: cbe7b3ec72 [formerly 6cc1c166f9 [formerly 2cd6c57e232b4f4a2a24c54d74e7ce9f08351b79]]
Former-commit-id: 6cc1c166f9
Former-commit-id: ddfc734c26
2014-04-28 14:06:15 -04:00
Shawn.Hooper
7a6c186baa Merge "ASM #577 - Removed com.raytheon.viz.dataaccess.feature plugin from p2-build.xml" into asm_14.2.1
Former-commit-id: 57a9e0d586 [formerly 4d6af11742 [formerly 9d7862fb7e7f4c3a16ba42b65e9111087dc0c8b3]]
Former-commit-id: 4d6af11742
Former-commit-id: 54ef1b1ca7
2014-04-28 09:37:28 -05:00
Shawn.Hooper
5f03948ff5 ASM #577 - Removed com.raytheon.viz.dataaccess.feature plugin from p2-build.xml
Change-Id: I505a9cc943b7ab09b430ca826efa1ee81f08a930

Former-commit-id: b4597dc021 [formerly a3e52e8cea [formerly 968a136e81b6247a03af9b78643c388d21a4218b]]
Former-commit-id: a3e52e8cea
Former-commit-id: 9182d8428a
2014-04-25 10:40:43 -04:00
Shawn.Hooper
1c57e8aff3 ASM #224 - WarnGen: OB13.5.2 Template Errors
Change-Id: I99339c0ea3d0110ca855dd3db82b41b28a32dd6d

Former-commit-id: 79db962a88 [formerly 09204a381c [formerly c6fffaf265dc184b7692a43bb461572f54b8190a]]
Former-commit-id: 09204a381c
Former-commit-id: 8ffe88d856
2014-04-25 10:19:48 -04:00
Steve Harris
3c02cbbcc9 Merge branch 'master_14.2.1' (14.2.1-19,20) into omaha_14.2.1
Change-Id: Ib48a2c15e266cd012aba975c25ef094b828a0f68

Former-commit-id: 18e79fe08d [formerly 4f9620bb04 [formerly 749922901de5a57c7344f29def844a5ecf90304a]]
Former-commit-id: 4f9620bb04
Former-commit-id: 066515b7c5
2014-04-25 09:09:38 -05:00
Brian.Dyke
ba9db6701e Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
Former-commit-id: ac74878ae2 [formerly a61af3e6d3 [formerly 48184880ce65a4899a4ed989f2d3f8082771047f]]
Former-commit-id: a61af3e6d3
Former-commit-id: a5c9321a8d
2014-04-24 13:28:31 -04:00
Brian.Dyke
81d39113fe Merged 13.5.5 -2 and -3 into 1412
Former-commit-id: e82fc8f89c [formerly a19f01c620 [formerly 4e921dbeab89e61635144b441ae0015155376c59]]
Former-commit-id: a19f01c620
Former-commit-id: eff27f5504
2014-04-24 13:01:50 -04:00
Brian.Dyke
4938304674 Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: a7c9ddc05e [formerly 2a4fe3dbae [formerly 64ca88d2ed7de18f9ed1f57edd2286bbc552135f]]
Former-commit-id: 2a4fe3dbae
Former-commit-id: 88d44a3129
2014-04-23 14:05:50 -04:00
Ron Anderson
6d77ebe181 Issue #3050 Fix SaveAsciiGridsHandler to get IFPServer instance based on site in the ParmID
Change-Id: Id2146e07f4e6103c9c96f2b09f0bae5980747052

Former-commit-id: 859d709a03 [formerly b12a6cd828 [formerly 6f141288cae462aac8c1ea8c77dd7f88a33c382a]]
Former-commit-id: b12a6cd828
Former-commit-id: db978fff9a
2014-04-22 14:38:54 -05:00
Zhidong.Hao
f32bb4e4f4 ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: I6176b14c5451ebd4ee520c2e5a13157457009303

Former-commit-id: 0177756f97 [formerly e1d5aa284d [formerly 4e7edc8ebbd79c16d6eb725c8d11d05f20424ed4]]
Former-commit-id: e1d5aa284d
Former-commit-id: f16936223a
2014-04-22 14:31:14 -04:00
Dave Hladky
7295635379 Issue #3012 Various fixes.
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded

Former-commit-id: 45059e722a [formerly 61fc2fea51 [formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]]
Former-commit-id: 61fc2fea51
Former-commit-id: 91bd735d47
2014-04-21 12:26:47 -05:00
Richard Peter
b15fd4c2f5 Merge "Issue #3011 Fixed slot cleanup" into omaha_14.2.1
Former-commit-id: 1e33125cb7 [formerly 9dc957f1a1 [formerly 8b8523aa60fa649a3208a5f3ae7dcb1fded3f0e6]]
Former-commit-id: 9dc957f1a1
Former-commit-id: dc41da4a65
2014-04-18 15:15:13 -05:00
Benjamin Phillippe
f4169e4e0c Issue #3011 Fixed slot cleanup
Change-Id: I346b0e2c17bcc0f3bcf946772694c127e8baffa5

Former-commit-id: b86fae838f [formerly b2686e46cf [formerly 4ac3c1a55fe7e99d7e9049ffb401b8ea3caf7983]]
Former-commit-id: b2686e46cf
Former-commit-id: b0d162ccba
2014-04-18 15:10:46 -05:00
Brian.Dyke
2d8d035b26 Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 9943a331c3 [formerly 880329e4ae [formerly d07d06f5e4b3c1dbf7d165ad97b9b114a4819011]]
Former-commit-id: 880329e4ae
Former-commit-id: 3b90abdf7a
2014-04-18 07:53:10 -04:00
Brian.Dyke
55d7d8dadb Merge branch 'asm_14.2.2' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.2
Former-commit-id: 645fe64a4a [formerly 1aec3b3698 [formerly 178acb792036869e903beea636c7216e1d3a4f58]]
Former-commit-id: 1aec3b3698
Former-commit-id: 53ce26a9b6
2014-04-17 14:42:44 -04:00
Brian.Dyke
735801a7e7 Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: b8829139a2 [formerly 12a482e1d7 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]
Former-commit-id: 12a482e1d7
Former-commit-id: 9df6fb2d4d
2014-04-17 14:42:35 -04:00
Nate Jensen
f8f47a8bf7 Issue #3018 addressing code review comments
Former-commit-id: 8ba6b2722d [formerly e327f5e0bf [formerly 85d9dd0158ab873e1e9b76805853c712bb0c7c2c]]
Former-commit-id: e327f5e0bf
Former-commit-id: 54951100af
2014-04-17 09:28:47 -05:00
Ron Anderson
ef02928b92 Merge "Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock" into omaha_14.2.1
Former-commit-id: 1ba72371be [formerly f9a393172f [formerly 6813b32786289503950322c02e32803299566c5d]]
Former-commit-id: f9a393172f
Former-commit-id: 85a1f55ea0
2014-04-16 18:02:11 -05:00
Nate Jensen
97c48103d7 Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock
Former-commit-id: c362af04f3 [formerly a085b71c81 [formerly 7384a2d32ef554362a0693038e9b60a589afb86a]]
Former-commit-id: a085b71c81
Former-commit-id: 781ec3ecd6
2014-04-16 17:25:09 -05:00
Nate Jensen
68d61fe16b Issue #3039 fix ifpImage class cast exception
Former-commit-id: 31fb61e824 [formerly 2b6db445c0 [formerly a2fd849c603aebacce09662557bf1f008d379982]]
Former-commit-id: 2b6db445c0
Former-commit-id: a5edace073
2014-04-16 16:17:05 -05:00
Brian.Dyke
9075808d0a Merged 13.5.5-1 into 1412
Former-commit-id: 35ad867281 [formerly 188d84cc87 [formerly f44629e87a6401a5b872c050b9cf79defd306171]]
Former-commit-id: 188d84cc87
Former-commit-id: 65ad515a6e
2014-04-16 12:09:12 -04:00
Nate Jensen
52e4a94bb3 Merge "Issue #3017 Update SatSpatialFactory to have more specific methods." into omaha_14.2.1
Former-commit-id: e0ae9e5f8f [formerly d121f07e76 [formerly 8e8bc62e063da4a8a864496ac6dbd73e798e45ed]]
Former-commit-id: d121f07e76
Former-commit-id: 9ebedf0b98
2014-04-16 08:41:54 -05:00