Steve Harris
|
16f5ff0979
|
CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]
Former-commit-id: b84dda5930
|
2014-06-20 14:01:55 -04:00 |
|
Brian.Dyke
|
be589ceb9b
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: 8ecdd9a192 [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]
Former-commit-id: 399c06820a
|
2014-06-18 08:55:49 -04:00 |
|
Brian.Dyke
|
06c565d74f
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Merge branch 'master_14.1.3_merge' into master_14.1.3
Former-commit-id: 482f915b42 [formerly 4b317062ce5c35823210cbbf023c0f0fc8051ef3]
Former-commit-id: 30d8644fa5
|
2014-06-13 14:05:49 -04:00 |
|
Brian.Dyke
|
5064d24e26
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: 81832d97e5 [formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]
Former-commit-id: 346bf852cd
|
2014-06-13 13:21:19 -04:00 |
|
Steve Harris
|
3a3277c469
|
Merge branch 'master_14.2.2' (14.2.2-13) into omaha_14.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: If5dae78936eddf1bc4ee63f35beb96a0cb9defb9
Former-commit-id: 9510608b74 [formerly cf56d49dc5a197fa114fa6c468860d63621a9cdc]
Former-commit-id: ad6e9fa5ee
|
2014-06-11 12:55:44 -05:00 |
|
David Friedman
|
6d0d3f5ba5
|
ASM #604 - Lightning display varies depending how long CAVE has been open
Change-Id: Id85b87e21833ef00e80693b8526d976ccb4bb63e
Former-commit-id: 1c84c31e30 [formerly a3f4fd6537f3847011e199e0f043968d9f595937]
Former-commit-id: b8542c1332
|
2014-06-11 13:37:16 +00:00 |
|
Brian.Dyke
|
0f07e14bf1
|
Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 9ab17ddecb [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]
Former-commit-id: f72380ad60
|
2014-06-10 13:56:03 -04:00 |
|
Brian.Dyke
|
ef5c74dece
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: 8874d41872 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]
Former-commit-id: c1b3f9d180
|
2014-06-10 12:52:59 -04:00 |
|
Steve Harris
|
6e09bce335
|
Merge branch 'master_14.2.2' (14.2.2-12) into omaha_14.2.2
Former-commit-id: bd98f04cde [formerly 65793ec4d12626b2d3365c5a0e8c3e229972b289]
Former-commit-id: 14370245fd
|
2014-06-09 15:20:03 -05:00 |
|
Mike Duff
|
b876d9755a
|
ASM #605 - Cherry-pick Omaha Issue #2954 from 14.3.1 into 14.2.2 to fix CAVE not starting if scale bundle is missing.
Change-Id: I3f7159b7a48e74fc9ad7a4220d6c30b67240aca1
Former-commit-id: 39173c380c [formerly 7fe0dae041cb68aba968e22d5895cce22a210ee6]
Former-commit-id: 81ab64d7ff
|
2014-06-06 16:03:14 -04:00 |
|
Xuezhi.Wei
|
81ec03e291
|
ASM #579 - shef-ingest.xml updates for performance tracking
Change-Id: If3b24f8385e955d003d79e22605d4536321c73b2
Former-commit-id: 33b235a0a4 [formerly f7b5f3bbc71cc251e19f1764ee7756050895b7a3]
Former-commit-id: bdbeec662c
|
2014-06-06 17:40:09 +00:00 |
|
Juliya Dynina
|
21cd415434
|
Merge "ASM #114 - Problem with Distance Speed Tool." into asm_14.2.2
Former-commit-id: 87216a87de [formerly 1e1c7cbcee94e782338d440d585a3217ad606725]
Former-commit-id: 80a83bd44c
|
2014-06-06 09:50:36 -05:00 |
|
Sean Webb
|
e0f9eabb45
|
Merge "ASM #611 fix to MHS issues in DR_17297" into asm_14.2.2
Former-commit-id: cb43d21243 [formerly 5556e19903965bea22ca2f11b51fcc1c95cb07f8]
Former-commit-id: 016648ffaf
|
2014-06-05 15:03:11 -05:00 |
|
Fay.Liang
|
fa2cdbfac1
|
ASM #611 fix to MHS issues in DR_17297
Change-Id: Ie32edc0bac5458e3d356a0b6b3deea0f8d520cb7
Former-commit-id: c5e6daa943 [formerly fc06896ae4d9adf0973522313f5e65df6ac67fa4]
Former-commit-id: d1aa160aa7
|
2014-06-05 15:49:27 -04:00 |
|
Mike Duff
|
28a42f3f10
|
Issue #3222 - Fix for SHEF posting times
Former-commit-id: f5f101d416 [formerly 3f1f9cf4fa6207edae642db5cffdc8284091f31a]
Former-commit-id: 8a5acd085d
|
2014-06-05 09:35:07 -05:00 |
|
Michael Gamazaychikov
|
e5a9fa0827
|
ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75
Former-commit-id: 50ab77046b [formerly a38308fa5a6efe9a07ecd84bd93662bea32afc94]
Former-commit-id: c07bcacbf8
|
2014-06-05 13:43:04 +01:00 |
|
Zhidong.Hao
|
ccbda4db4f
|
ASM #106 - AvnFPS Monitor TAF valid time display different from A1
Change-Id: Iddf3f4ee46b94f28494dc15764b91f38c0176325
Former-commit-id: 71ab6b9ed0 [formerly 74597b2630ffd8d984b193f72126a9a5d0b3a942]
Former-commit-id: 26c6801620
|
2014-06-03 11:55:32 -04:00 |
|
brian.dyke
|
2f53c2e385
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: ee7c67f7b0 [formerly d7b707236a1ee3bca45dee26c10814d9e3c275c8]
Former-commit-id: 7dde6e1d04
|
2014-05-30 10:07:12 -04:00 |
|
Matthew Howard
|
099185c960
|
Merge "ASM #209 - Fix Svcbu cleanup script" into asm_14.2.2
Former-commit-id: 8375a2af3e [formerly def2351f527613dd62a081161e5f3a87756493ec]
Former-commit-id: 781d0331ab
|
2014-05-29 15:54:37 -05:00 |
|
Shawn.Hooper
|
08ad9a66cc
|
ASM #209 - Fix Svcbu cleanup script
Change-Id: I4da44d4c410c03769e556dc6abca62db52880997
Former-commit-id: 5cf0579d20 [formerly 626ee991cd7e9dbfe52342abd9e3fd41b973f72a]
Former-commit-id: fe567b2a5b
|
2014-05-29 16:56:46 -04:00 |
|
Steve Harris
|
53645445fe
|
Merge branch 'master_14.2.2' (14.2.2-9,10,11) into omaha_14.2.2
Former-commit-id: 9313e045bf [formerly 03b376033b3374694bc8a6e0a2c55b830db058e1]
Former-commit-id: c7ef7878f5
|
2014-05-29 07:45:24 -05:00 |
|
Brian.Dyke
|
47a37b112a
|
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 f2763f73cf3e5f2d9e66efa6e481dbf66f16e7da]
Former-commit-id: b7ef9420e1
|
2014-05-28 16:25:33 -04:00 |
|
Brian.Dyke
|
6f64664e70
|
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 b92ce0c1589c48de73387c142f1302409a3b0cb7]
Former-commit-id: 4c010cf27a
|
2014-05-28 09:36:15 -04:00 |
|
Brian.Dyke
|
089b2559bb
|
CM-MERGE:OB13.5.5-11 into 14.1.2
Former-commit-id: e852623f48 [formerly c85d4369600bfc24405386aa71713d7f2d58b201]
Former-commit-id: e95ee60224
|
2014-05-28 08:40:56 -04:00 |
|
Brian.Dyke
|
ea618935d0
|
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 34c582add16be1620f400d78d2f37da8c534f71a]
Former-commit-id: 575cebda84
|
2014-05-27 13:42:09 -04:00 |
|
Brian.Dyke
|
4a1b6d70c4
|
CM-MERGE:OB13.5.5-10 into 14.1.2
Former-commit-id: ba8d7dbbb7 [formerly d57f7989982a59a546116b63a406294573844039]
Former-commit-id: 89a8caddbb
|
2014-05-27 13:30:35 -04:00 |
|
Fay.Liang
|
17f1404221
|
ASM #596 - Watch wording not properly inserted into some warning products
Change-Id: I7dc223d95f06a6a259e969cfbb8e4bde2f4b9192
Former-commit-id: 4fa60f159a [formerly ed8cd169fe0a531d0d83411f7b1afe787088d406]
Former-commit-id: c007420e22
|
2014-05-23 15:47:50 -04:00 |
|
Steve Harris
|
1e34c7eda3
|
Merge branch 'master_14.2.2' (14.2.2-8) into omaha_14.2.2
Former-commit-id: acecfd7dfa [formerly a125cbc03cc5cace25e35b3516c34f9d7060a78e]
Former-commit-id: 3ed42be350
|
2014-05-22 13:52:02 -05:00 |
|
brian.dyke
|
f405e8c89c
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: f74b1707f9 [formerly 59ff65f9d31cef6549ea8912adceb9ed4c7d11f6]
Former-commit-id: 562f53874a
|
2014-05-22 12:46:56 -04:00 |
|
Michael Gamazaychikov
|
8ae5d535de
|
ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes).
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85
Former-commit-id: 5bff9f2ac8 [formerly f3ee76edfd95e9c25eff89d1ecbff9e466b3ca75]
Former-commit-id: 63409ef272
|
2014-05-21 15:12:08 +01:00 |
|
Brian.Dyke
|
822ad181bf
|
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 ed430b59789d9a00e20bdaadc8d55b92a4a4064b]
Former-commit-id: 2fd18d14d6
|
2014-05-20 14:35:34 -04:00 |
|
Brian.Dyke
|
88a5ecefaa
|
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 d9c230fbd50cc5acf1dd5c7c5e775f337de41921]
Former-commit-id: e5f951bf89
|
2014-05-20 12:08:29 -04:00 |
|
Brian.Dyke
|
8435ace4f8
|
CM-MERGE:OB13.5.5-9 into 14.1.2
Former-commit-id: abf0f995cd [formerly a2e2daca86d7efb28cb4e3eb8b9ef2ac92e1fc22]
Former-commit-id: 545e7f6ce9
|
2014-05-20 11:56:30 -04:00 |
|
Brian.Dyke
|
c4b7b8dd74
|
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 19032f03b1d2166f4afd936bb2b56e0b4851d9f4]
Former-commit-id: dbd3bb54e8
|
2014-05-19 14:07:04 -04:00 |
|
Brian.Dyke
|
2eae2be646
|
CM-MERGE:OB13.5.5-8 into 14.1.2
Former-commit-id: 06c2478539 [formerly 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470]
Former-commit-id: b29db01a59
|
2014-05-19 13:26:45 -04:00 |
|
Gang.Zhang
|
6e034005e0
|
ASM #95 - Fix 0.0 for NO DATA Issue caused failed back.
Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac
Former-commit-id: 9c1587b92d [formerly 5880dcd0b727c3d473873b8382ace78955ab800b]
Former-commit-id: 94fea6748f
|
2014-05-19 15:40:41 +01:00 |
|
Brian.Dyke
|
509616ba6a
|
CM-MERGE:OB13.5.5-7 into 14.1.2
Former-commit-id: e9bd17a21f [formerly 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114]
Former-commit-id: f8ed9c7944
|
2014-05-19 07:55:42 -04:00 |
|
David Friedman
|
a920c5a5e4
|
Merge "ASM #240 - RPS lists delivered by awips2-rcm out of date" into asm_14.2.2
Former-commit-id: a55e851780 [formerly a4c1c5524c31384c3532076ee151fd9a294367d2]
Former-commit-id: c909746e0e
|
2014-05-16 16:40:38 -05:00 |
|
David Friedman
|
b462660d75
|
ASM #240 - RPS lists delivered by awips2-rcm out of date
Change-Id: I811bfebab480c5655f7260b85daa36f69e9550eb
Former-commit-id: eab9a6b6d7 [formerly 880c5d7259a5af17f2452fa3bd9f18d852c81d82]
Former-commit-id: caa38ec709
|
2014-05-16 21:38:34 +00:00 |
|
David Friedman
|
404f3af49e
|
ASM #592 - RadarServer does not sent OTRs for RSS product to TDWRs
Change-Id: Iabb354391ea63b6f9c316ea8316fc28128a956f5
Former-commit-id: 3b69a240c8 [formerly 4fd6bbfba29a39bf125269ab8342b826995e3d86]
Former-commit-id: 1503bc4162
|
2014-05-16 21:34:59 +00:00 |
|
Brian.Dyke
|
c2afc26206
|
Merge branch 'omaha_14.2.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1
Former-commit-id: dcd238c6a3 [formerly 18486e2e8ead4614c05e3a7775cba95cd78053c8]
Former-commit-id: 3183283e99
|
2014-05-16 08:45:47 -04:00 |
|
Brian.Dyke
|
2de7de6378
|
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 d75db45cdfa20fed7568b825ca0dfd8c8689d22a]
Former-commit-id: b066572041
|
2014-05-15 16:40:47 -04:00 |
|
Brian.Dyke
|
08f69fd3a1
|
CM-MERGE:OB13.5.5-6 into 14.1.2
Former-commit-id: c81d54b651 [formerly 11acfb00bda7686c68e24903df4831cf57bf86de]
Former-commit-id: 81a1affe22
|
2014-05-15 14:16:38 -04:00 |
|
Steve Harris
|
01a6ce5b9b
|
Merge branch 'master_14.2.2' (14.2.2-9) into omaha_14.2.2
Former-commit-id: a6aa34210c [formerly b1bf5bdc4a81c55c9cd30ac77857509a2e8f5a08]
Former-commit-id: 85850ed33e
|
2014-05-15 08:12:49 -05:00 |
|
Dave Hladky
|
3b544c74b6
|
Issue #3168 Move DD retrieval distibution to correct feature/RPM
Change-Id: I1110eec9d4cde805a67cc33254b98fc00fd8a7b1
Former-commit-id: 783cd9e308 [formerly d94e7f139573caa508b260902870c9f745080bb8]
Former-commit-id: c72be97b9b
|
2014-05-14 16:13:57 -05:00 |
|
Brian.Dyke
|
f38d0138e6
|
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 f7d6bee49c5777e5d63c724eba1242a1baf153ac]
Former-commit-id: 627541512d
|
2014-05-14 16:08:16 -04:00 |
|
Shawn Hooper
|
3143b15d26
|
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 b774242fcff4bf603b82c8a6657e372d8bdc3c19]
Former-commit-id: 2fe0c47c6d
|
2014-05-14 14:39:57 -05:00 |
|
Dave Hladky
|
40c24180cf
|
Issue #3168 Move retrieval distribution to correct DD RPM
Former-commit-id: 15366714ed [formerly 228ef1ceb7337fa38c370c3218d1c32b4f1302fb]
Former-commit-id: ca644b93ee
|
2014-05-14 11:12:55 -05:00 |
|
Steve Harris
|
bef1d9681c
|
Merge branch 'master_14.2.2' (14.2.2-8) into omaha_14.2.2
Former-commit-id: f5bc8e598b [formerly a2f35d52b5ffbf2fee8bd953eb795810972e4e53]
Former-commit-id: 2247a499c4
|
2014-05-13 15:32:39 -05:00 |
|
Steve Harris
|
462609aa3f
|
Merge branch 'master_14.2.1' (14.2.1-24) into omaha_14.2.1
Former-commit-id: 70b95c7636 [formerly 2627e4d38b3dcee82dcf7a6032d692170d50d9ad]
Former-commit-id: c2efe26c11
|
2014-05-13 15:23:57 -05:00 |
|