Sean Webb
|
52283357c8
|
Merge "ASM #611 fix to MHS issues in DR_17297" into asm_14.2.2
Former-commit-id: cb43d21243 [formerly 016648ffaf [formerly 5556e19903965bea22ca2f11b51fcc1c95cb07f8]]
Former-commit-id: 016648ffaf
Former-commit-id: e0f9eabb45
|
2014-06-05 15:03:11 -05:00 |
|
Fay.Liang
|
46926b679d
|
ASM #611 fix to MHS issues in DR_17297
Change-Id: Ie32edc0bac5458e3d356a0b6b3deea0f8d520cb7
Former-commit-id: c5e6daa943 [formerly d1aa160aa7 [formerly fc06896ae4d9adf0973522313f5e65df6ac67fa4]]
Former-commit-id: d1aa160aa7
Former-commit-id: fa2cdbfac1
|
2014-06-05 15:49:27 -04:00 |
|
Mike Duff
|
3a3928cde3
|
Issue #3222 - Fix for SHEF posting times
Former-commit-id: f5f101d416 [formerly 8a5acd085d [formerly 3f1f9cf4fa6207edae642db5cffdc8284091f31a]]
Former-commit-id: 8a5acd085d
Former-commit-id: 28a42f3f10
|
2014-06-05 09:35:07 -05:00 |
|
Michael Gamazaychikov
|
efd0fb50b8
|
ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75
Former-commit-id: 50ab77046b [formerly c07bcacbf8 [formerly a38308fa5a6efe9a07ecd84bd93662bea32afc94]]
Former-commit-id: c07bcacbf8
Former-commit-id: e5a9fa0827
|
2014-06-05 13:43:04 +01:00 |
|
Zhidong.Hao
|
43e1a5a909
|
ASM #106 - AvnFPS Monitor TAF valid time display different from A1
Change-Id: Iddf3f4ee46b94f28494dc15764b91f38c0176325
Former-commit-id: 71ab6b9ed0 [formerly 26c6801620 [formerly 74597b2630ffd8d984b193f72126a9a5d0b3a942]]
Former-commit-id: 26c6801620
Former-commit-id: ccbda4db4f
|
2014-06-03 11:55:32 -04:00 |
|
brian.dyke
|
e1f9c919e6
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: ee7c67f7b0 [formerly 7dde6e1d04 [formerly d7b707236a1ee3bca45dee26c10814d9e3c275c8]]
Former-commit-id: 7dde6e1d04
Former-commit-id: 2f53c2e385
|
2014-05-30 10:07:12 -04:00 |
|
Matthew Howard
|
d0880003a6
|
Merge "ASM #209 - Fix Svcbu cleanup script" into asm_14.2.2
Former-commit-id: 8375a2af3e [formerly 781d0331ab [formerly def2351f527613dd62a081161e5f3a87756493ec]]
Former-commit-id: 781d0331ab
Former-commit-id: 099185c960
|
2014-05-29 15:54:37 -05:00 |
|
Shawn.Hooper
|
4de35d0a2b
|
ASM #209 - Fix Svcbu cleanup script
Change-Id: I4da44d4c410c03769e556dc6abca62db52880997
Former-commit-id: 5cf0579d20 [formerly fe567b2a5b [formerly 626ee991cd7e9dbfe52342abd9e3fd41b973f72a]]
Former-commit-id: fe567b2a5b
Former-commit-id: 08ad9a66cc
|
2014-05-29 16:56:46 -04:00 |
|
Steve Harris
|
74b0099fdf
|
Merge branch 'master_14.2.2' (14.2.2-9,10,11) into omaha_14.2.2
Former-commit-id: 9313e045bf [formerly c7ef7878f5 [formerly 03b376033b3374694bc8a6e0a2c55b830db058e1]]
Former-commit-id: c7ef7878f5
Former-commit-id: 53645445fe
|
2014-05-29 07:45:24 -05:00 |
|
Brian.Dyke
|
9e0cf9b945
|
Merge remote-tracking branch 'remotes/origin/master_14.2.1' into master_14.2.2 CM-MERGE:14.2.1-30 into 14.2.2
Former-commit-id: 574246b6d4 [formerly b7ef9420e1 [formerly f2763f73cf3e5f2d9e66efa6e481dbf66f16e7da]]
Former-commit-id: b7ef9420e1
Former-commit-id: 47a37b112a
|
2014-05-28 16:25:33 -04:00 |
|
Brian.Dyke
|
0fe87c550c
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-10 into 14.2.1
Former-commit-id: ce81b44f32 [formerly 4c010cf27a [formerly b92ce0c1589c48de73387c142f1302409a3b0cb7]]
Former-commit-id: 4c010cf27a
Former-commit-id: 6f64664e70
|
2014-05-28 09:36:15 -04:00 |
|
Brian.Dyke
|
fba5604613
|
CM-MERGE:OB13.5.5-11 into 14.1.2
Former-commit-id: e852623f48 [formerly e95ee60224 [formerly c85d4369600bfc24405386aa71713d7f2d58b201]]
Former-commit-id: e95ee60224
Former-commit-id: 089b2559bb
|
2014-05-28 08:40:56 -04:00 |
|
Brian.Dyke
|
f3b0bdff29
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-9 into 14.2.1
Former-commit-id: 638acc2c06 [formerly 575cebda84 [formerly 34c582add16be1620f400d78d2f37da8c534f71a]]
Former-commit-id: 575cebda84
Former-commit-id: ea618935d0
|
2014-05-27 13:42:09 -04:00 |
|
Brian.Dyke
|
86eefc2026
|
CM-MERGE:OB13.5.5-10 into 14.1.2
Former-commit-id: ba8d7dbbb7 [formerly 89a8caddbb [formerly d57f7989982a59a546116b63a406294573844039]]
Former-commit-id: 89a8caddbb
Former-commit-id: 4a1b6d70c4
|
2014-05-27 13:30:35 -04:00 |
|
Fay.Liang
|
61c177c7b2
|
ASM #596 - Watch wording not properly inserted into some warning products
Change-Id: I7dc223d95f06a6a259e969cfbb8e4bde2f4b9192
Former-commit-id: 4fa60f159a [formerly c007420e22 [formerly ed8cd169fe0a531d0d83411f7b1afe787088d406]]
Former-commit-id: c007420e22
Former-commit-id: 17f1404221
|
2014-05-23 15:47:50 -04:00 |
|
Steve Harris
|
7b9e17582c
|
Merge branch 'master_14.2.2' (14.2.2-8) into omaha_14.2.2
Former-commit-id: acecfd7dfa [formerly 3ed42be350 [formerly a125cbc03cc5cace25e35b3516c34f9d7060a78e]]
Former-commit-id: 3ed42be350
Former-commit-id: 1e34c7eda3
|
2014-05-22 13:52:02 -05:00 |
|
brian.dyke
|
ed62e77a57
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: f74b1707f9 [formerly 562f53874a [formerly 59ff65f9d31cef6549ea8912adceb9ed4c7d11f6]]
Former-commit-id: 562f53874a
Former-commit-id: f405e8c89c
|
2014-05-22 12:46:56 -04:00 |
|
Michael Gamazaychikov
|
b3d76892d1
|
ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes).
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85
Former-commit-id: 5bff9f2ac8 [formerly 63409ef272 [formerly f3ee76edfd95e9c25eff89d1ecbff9e466b3ca75]]
Former-commit-id: 63409ef272
Former-commit-id: 8ae5d535de
|
2014-05-21 15:12:08 +01:00 |
|
Brian.Dyke
|
5afaee3d33
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
Former-commit-id: db68b80bbd [formerly 2fd18d14d6 [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]
Former-commit-id: 2fd18d14d6
Former-commit-id: 822ad181bf
|
2014-05-20 14:35:34 -04:00 |
|
Brian.Dyke
|
9426ddb9a9
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-8 into 14.2.1
Former-commit-id: 8c2cccb930 [formerly e5f951bf89 [formerly d9c230fbd50cc5acf1dd5c7c5e775f337de41921]]
Former-commit-id: e5f951bf89
Former-commit-id: 88a5ecefaa
|
2014-05-20 12:08:29 -04:00 |
|
Brian.Dyke
|
c9ef80beeb
|
CM-MERGE:OB13.5.5-9 into 14.1.2
Former-commit-id: abf0f995cd [formerly 545e7f6ce9 [formerly a2e2daca86d7efb28cb4e3eb8b9ef2ac92e1fc22]]
Former-commit-id: 545e7f6ce9
Former-commit-id: 8435ace4f8
|
2014-05-20 11:56:30 -04:00 |
|
Brian.Dyke
|
432e5f15a5
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-6,-7 into 14.2.1
Former-commit-id: d5a4669fc4 [formerly dbd3bb54e8 [formerly 19032f03b1d2166f4afd936bb2b56e0b4851d9f4]]
Former-commit-id: dbd3bb54e8
Former-commit-id: c4b7b8dd74
|
2014-05-19 14:07:04 -04:00 |
|
Brian.Dyke
|
75f7d77c45
|
CM-MERGE:OB13.5.5-8 into 14.1.2
Former-commit-id: 06c2478539 [formerly b29db01a59 [formerly 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470]]
Former-commit-id: b29db01a59
Former-commit-id: 2eae2be646
|
2014-05-19 13:26:45 -04:00 |
|
Gang.Zhang
|
98e50ae694
|
ASM #95 - Fix 0.0 for NO DATA Issue caused failed back.
Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac
Former-commit-id: 9c1587b92d [formerly 94fea6748f [formerly 5880dcd0b727c3d473873b8382ace78955ab800b]]
Former-commit-id: 94fea6748f
Former-commit-id: 6e034005e0
|
2014-05-19 15:40:41 +01:00 |
|
Brian.Dyke
|
a9f2fdb086
|
CM-MERGE:OB13.5.5-7 into 14.1.2
Former-commit-id: e9bd17a21f [formerly f8ed9c7944 [formerly 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114]]
Former-commit-id: f8ed9c7944
Former-commit-id: 509616ba6a
|
2014-05-19 07:55:42 -04:00 |
|
David Friedman
|
99edfe0a17
|
Merge "ASM #240 - RPS lists delivered by awips2-rcm out of date" into asm_14.2.2
Former-commit-id: a55e851780 [formerly c909746e0e [formerly a4c1c5524c31384c3532076ee151fd9a294367d2]]
Former-commit-id: c909746e0e
Former-commit-id: a920c5a5e4
|
2014-05-16 16:40:38 -05:00 |
|
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 |
|
David Friedman
|
39e412aac8
|
ASM #592 - RadarServer does not sent OTRs for RSS product to TDWRs
Change-Id: Iabb354391ea63b6f9c316ea8316fc28128a956f5
Former-commit-id: 3b69a240c8 [formerly 1503bc4162 [formerly 4fd6bbfba29a39bf125269ab8342b826995e3d86]]
Former-commit-id: 1503bc4162
Former-commit-id: 404f3af49e
|
2014-05-16 21:34:59 +00:00 |
|
Brian.Dyke
|
99e1c53457
|
Merge branch 'omaha_14.2.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1
Former-commit-id: dcd238c6a3 [formerly 3183283e99 [formerly 18486e2e8ead4614c05e3a7775cba95cd78053c8]]
Former-commit-id: 3183283e99
Former-commit-id: c2afc26206
|
2014-05-16 08:45:47 -04:00 |
|
Brian.Dyke
|
f9a40a24e3
|
Merge remote-tracking branch 'remotes/origin/master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-5 into 14.2.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
Former-commit-id: c8f21e92fe [formerly b066572041 [formerly d75db45cdfa20fed7568b825ca0dfd8c8689d22a]]
Former-commit-id: b066572041
Former-commit-id: 2de7de6378
|
2014-05-15 16:40:47 -04:00 |
|
Brian.Dyke
|
ac7b375d91
|
CM-MERGE:OB13.5.5-6 into 14.1.2
Former-commit-id: c81d54b651 [formerly 81a1affe22 [formerly 11acfb00bda7686c68e24903df4831cf57bf86de]]
Former-commit-id: 81a1affe22
Former-commit-id: 08f69fd3a1
|
2014-05-15 14:16:38 -04:00 |
|
Steve Harris
|
e05747f71e
|
Merge branch 'master_14.2.2' (14.2.2-9) into omaha_14.2.2
Former-commit-id: a6aa34210c [formerly 85850ed33e [formerly b1bf5bdc4a81c55c9cd30ac77857509a2e8f5a08]]
Former-commit-id: 85850ed33e
Former-commit-id: 01a6ce5b9b
|
2014-05-15 08:12:49 -05:00 |
|
Dave Hladky
|
0e73a4d2a8
|
Issue #3168 Move DD retrieval distibution to correct feature/RPM
Change-Id: I1110eec9d4cde805a67cc33254b98fc00fd8a7b1
Former-commit-id: 783cd9e308 [formerly c72be97b9b [formerly d94e7f139573caa508b260902870c9f745080bb8]]
Former-commit-id: c72be97b9b
Former-commit-id: 3b544c74b6
|
2014-05-14 16:13:57 -05: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 |
|
Dave Hladky
|
6a80ab5dfb
|
Issue #3168 Move retrieval distribution to correct DD RPM
Former-commit-id: 15366714ed [formerly ca644b93ee [formerly 228ef1ceb7337fa38c370c3218d1c32b4f1302fb]]
Former-commit-id: ca644b93ee
Former-commit-id: 40c24180cf
|
2014-05-14 11:12:55 -05:00 |
|
Steve Harris
|
293dafa266
|
Merge branch 'master_14.2.2' (14.2.2-8) into omaha_14.2.2
Former-commit-id: f5bc8e598b [formerly 2247a499c4 [formerly a2f35d52b5ffbf2fee8bd953eb795810972e4e53]]
Former-commit-id: 2247a499c4
Former-commit-id: bef1d9681c
|
2014-05-13 15:32:39 -05:00 |
|
Steve Harris
|
2441e29987
|
Merge branch 'master_14.2.1' (14.2.1-24) into omaha_14.2.1
Former-commit-id: 70b95c7636 [formerly c2efe26c11 [formerly 2627e4d38b3dcee82dcf7a6032d692170d50d9ad]]
Former-commit-id: c2efe26c11
Former-commit-id: 462609aa3f
|
2014-05-13 15:23: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 |
|
Ben Steffensmeier
|
b2d89eae80
|
Issue #2289 Fix TempOfTe at small pressure values.
Former-commit-id: 102d560686 [formerly 2754326906 [formerly a114bf15018ab86ec1511c13704fd6e1e3feed99]]
Former-commit-id: 2754326906
Former-commit-id: d051416c76
|
2014-05-12 10:11:34 -05: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 |
|