Ron Anderson
|
e5b81ccee0
|
Issue #3317 Fix merge problem that removed GFE notification of D2D purge
Change-Id: I925b7287bdb2fb7f9c330b05b1b2c32031e693d9
Former-commit-id: ead09dd683 [formerly ead09dd683 [formerly 04805a8957ef14754225f85f4722d8302cde8df3]]
Former-commit-id: a6956a8ccd
Former-commit-id: 7abeff57cc
|
2014-06-25 19:12:51 +00:00 |
|
Ron Anderson
|
2cc92ecc69
|
Issue #3317 Fix issue with obsolete D2DGridDatabases not getting purged.
Change-Id: If792327215bb9f8db470c95099463e735c462d46
Former-commit-id: 898b30fadb [formerly 898b30fadb [formerly 2a84ea1af7bb767e9e85387de1fd90c662f9f91d]]
Former-commit-id: 2ac9cd84ec
Former-commit-id: ff5c0f2c33
|
2014-06-25 13:21:32 -05:00 |
|
Steve Harris
|
323c240f59
|
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: 89606076ec [formerly 89606076ec [formerly 174fe6d66525229f328846a1f4564300d7603c10]]
Former-commit-id: ddc6f2092a
Former-commit-id: 1f033d22e6
|
2014-06-24 10:57:56 -05:00 |
|
Nate Jensen
|
e717dbfeb1
|
Issue #3248 ensure that a locking file output streams obtains the lock
before calling the FileOutputStream constructor
Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
(cherry picked from commit e8d704968a2a87105489ad9cb51cd8aea78401aa [formerly 65eb76ff66] [formerly 845483346f [formerly 845483346f [formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716]]])
Former-commit-id: ca27873204 [formerly ca27873204 [formerly f0ad63d2ccf347e92274701f9890e120b9e70140]]
Former-commit-id: 65619399a0
Former-commit-id: f9fce25836
|
2014-06-23 11:59:26 -05:00 |
|
Nate Jensen
|
9a3a4d5bfd
|
Issue #3307 fix xml serialization of looping field
Former-commit-id: 51da67dd3f [formerly 51da67dd3f [formerly c6ce72840a4ee0f44eacff46015b5382d86dd47f]]
Former-commit-id: 97ef9fc343
Former-commit-id: a3c20eb98a
|
2014-06-23 09:54:11 -05:00 |
|
Steve Harris
|
935542914d
|
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: b84dda5930 [formerly b84dda5930 [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]
Former-commit-id: 419c5f4aba
Former-commit-id: 66d30e59a3
|
2014-06-20 14:01:55 -04:00 |
|
Brian.Dyke
|
3e10995d87
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: 399c06820a [formerly 399c06820a [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]
Former-commit-id: 8ecdd9a192
Former-commit-id: 9031f58d02
|
2014-06-18 08:55:49 -04:00 |
|
Brian.Dyke
|
ce9ebc90f5
|
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: 30d8644fa5 [formerly 30d8644fa5 [formerly 4b317062ce5c35823210cbbf023c0f0fc8051ef3]]
Former-commit-id: 482f915b42
Former-commit-id: 072a4a9d63
|
2014-06-13 14:05:49 -04:00 |
|
Brian.Dyke
|
766974a05d
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: 346bf852cd [formerly 346bf852cd [formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]]
Former-commit-id: 81832d97e5
Former-commit-id: 4bca0769fb
|
2014-06-13 13:21:19 -04:00 |
|
Steve Harris
|
5a86a00518
|
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: ad6e9fa5ee [formerly ad6e9fa5ee [formerly cf56d49dc5a197fa114fa6c468860d63621a9cdc]]
Former-commit-id: 9510608b74
Former-commit-id: 23dea36a2c
|
2014-06-11 12:55:44 -05:00 |
|
David Friedman
|
d50646b479
|
ASM #604 - Lightning display varies depending how long CAVE has been open
Change-Id: Id85b87e21833ef00e80693b8526d976ccb4bb63e
Former-commit-id: b8542c1332 [formerly b8542c1332 [formerly a3f4fd6537f3847011e199e0f043968d9f595937]]
Former-commit-id: 1c84c31e30
Former-commit-id: 8c8f54994b
|
2014-06-11 13:37:16 +00:00 |
|
Brian.Dyke
|
a4b39dfca5
|
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: f72380ad60 [formerly f72380ad60 [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]
Former-commit-id: 9ab17ddecb
Former-commit-id: 49cd9574d9
|
2014-06-10 13:56:03 -04:00 |
|
Brian.Dyke
|
81d732477e
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: c1b3f9d180 [formerly c1b3f9d180 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]
Former-commit-id: 8874d41872
Former-commit-id: f568b5606a
|
2014-06-10 12:52:59 -04:00 |
|
Steve Harris
|
2569e13053
|
Merge branch 'master_14.2.2' (14.2.2-12) into omaha_14.2.2
Former-commit-id: 14370245fd [formerly 14370245fd [formerly 65793ec4d12626b2d3365c5a0e8c3e229972b289]]
Former-commit-id: bd98f04cde
Former-commit-id: c11a44259e
|
2014-06-09 15:20:03 -05:00 |
|
Mike Duff
|
4b9f707a06
|
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: 81ab64d7ff [formerly 81ab64d7ff [formerly 7fe0dae041cb68aba968e22d5895cce22a210ee6]]
Former-commit-id: 39173c380c
Former-commit-id: b880d171d4
|
2014-06-06 16:03:14 -04:00 |
|
Xuezhi.Wei
|
ae0a348358
|
ASM #579 - shef-ingest.xml updates for performance tracking
Change-Id: If3b24f8385e955d003d79e22605d4536321c73b2
Former-commit-id: bdbeec662c [formerly bdbeec662c [formerly f7b5f3bbc71cc251e19f1764ee7756050895b7a3]]
Former-commit-id: 33b235a0a4
Former-commit-id: 445d58699a
|
2014-06-06 17:40:09 +00:00 |
|
Juliya Dynina
|
93c2e97e2e
|
Merge "ASM #114 - Problem with Distance Speed Tool." into asm_14.2.2
Former-commit-id: 80a83bd44c [formerly 80a83bd44c [formerly 1e1c7cbcee94e782338d440d585a3217ad606725]]
Former-commit-id: 87216a87de
Former-commit-id: b6a4959e21
|
2014-06-06 09:50:36 -05:00 |
|
Sean Webb
|
4e6fa39e5e
|
Merge "ASM #611 fix to MHS issues in DR_17297" into asm_14.2.2
Former-commit-id: 016648ffaf [formerly 016648ffaf [formerly 5556e19903965bea22ca2f11b51fcc1c95cb07f8]]
Former-commit-id: cb43d21243
Former-commit-id: c52983ab68
|
2014-06-05 15:03:11 -05:00 |
|
Fay.Liang
|
ce1e19955e
|
ASM #611 fix to MHS issues in DR_17297
Change-Id: Ie32edc0bac5458e3d356a0b6b3deea0f8d520cb7
Former-commit-id: d1aa160aa7 [formerly d1aa160aa7 [formerly fc06896ae4d9adf0973522313f5e65df6ac67fa4]]
Former-commit-id: c5e6daa943
Former-commit-id: 39efc11cb3
|
2014-06-05 15:49:27 -04:00 |
|
Mike Duff
|
a615c41a57
|
Issue #3222 - Fix for SHEF posting times
Former-commit-id: 8a5acd085d [formerly 8a5acd085d [formerly 3f1f9cf4fa6207edae642db5cffdc8284091f31a]]
Former-commit-id: f5f101d416
Former-commit-id: 87d41ff302
|
2014-06-05 09:35:07 -05:00 |
|
Michael Gamazaychikov
|
29e197404f
|
ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75
Former-commit-id: c07bcacbf8 [formerly c07bcacbf8 [formerly a38308fa5a6efe9a07ecd84bd93662bea32afc94]]
Former-commit-id: 50ab77046b
Former-commit-id: 5efb82ea3e
|
2014-06-05 13:43:04 +01:00 |
|
Zhidong.Hao
|
3a9abec04b
|
ASM #106 - AvnFPS Monitor TAF valid time display different from A1
Change-Id: Iddf3f4ee46b94f28494dc15764b91f38c0176325
Former-commit-id: 26c6801620 [formerly 26c6801620 [formerly 74597b2630ffd8d984b193f72126a9a5d0b3a942]]
Former-commit-id: 71ab6b9ed0
Former-commit-id: e5c47a51eb
|
2014-06-03 11:55:32 -04:00 |
|
brian.dyke
|
05f691d0cd
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 7dde6e1d04 [formerly 7dde6e1d04 [formerly d7b707236a1ee3bca45dee26c10814d9e3c275c8]]
Former-commit-id: ee7c67f7b0
Former-commit-id: cf49a7217f
|
2014-05-30 10:07:12 -04:00 |
|
Matthew Howard
|
04c0631701
|
Merge "ASM #209 - Fix Svcbu cleanup script" into asm_14.2.2
Former-commit-id: 781d0331ab [formerly 781d0331ab [formerly def2351f527613dd62a081161e5f3a87756493ec]]
Former-commit-id: 8375a2af3e
Former-commit-id: f68748bd63
|
2014-05-29 15:54:37 -05:00 |
|
Shawn.Hooper
|
3cb14aecd9
|
ASM #209 - Fix Svcbu cleanup script
Change-Id: I4da44d4c410c03769e556dc6abca62db52880997
Former-commit-id: fe567b2a5b [formerly fe567b2a5b [formerly 626ee991cd7e9dbfe52342abd9e3fd41b973f72a]]
Former-commit-id: 5cf0579d20
Former-commit-id: 2c476e2bb4
|
2014-05-29 16:56:46 -04:00 |
|
Steve Harris
|
ba06fa79f9
|
Merge branch 'master_14.2.2' (14.2.2-9,10,11) into omaha_14.2.2
Former-commit-id: c7ef7878f5 [formerly c7ef7878f5 [formerly 03b376033b3374694bc8a6e0a2c55b830db058e1]]
Former-commit-id: 9313e045bf
Former-commit-id: e92b927c5a
|
2014-05-29 07:45:24 -05:00 |
|
Brian.Dyke
|
551def9f1a
|
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: b7ef9420e1 [formerly b7ef9420e1 [formerly f2763f73cf3e5f2d9e66efa6e481dbf66f16e7da]]
Former-commit-id: 574246b6d4
Former-commit-id: 2c1fabb0f8
|
2014-05-28 16:25:33 -04:00 |
|
Brian.Dyke
|
f5bc17ef24
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-10 into 14.2.1
Former-commit-id: 4c010cf27a [formerly 4c010cf27a [formerly b92ce0c1589c48de73387c142f1302409a3b0cb7]]
Former-commit-id: ce81b44f32
Former-commit-id: 73ec45c5b2
|
2014-05-28 09:36:15 -04:00 |
|
Brian.Dyke
|
21112face5
|
CM-MERGE:OB13.5.5-11 into 14.1.2
Former-commit-id: e95ee60224 [formerly e95ee60224 [formerly c85d4369600bfc24405386aa71713d7f2d58b201]]
Former-commit-id: e852623f48
Former-commit-id: b745ac5926
|
2014-05-28 08:40:56 -04:00 |
|
Brian.Dyke
|
09f2d8b8b1
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-9 into 14.2.1
Former-commit-id: 575cebda84 [formerly 575cebda84 [formerly 34c582add16be1620f400d78d2f37da8c534f71a]]
Former-commit-id: 638acc2c06
Former-commit-id: 290b85b556
|
2014-05-27 13:42:09 -04:00 |
|
Brian.Dyke
|
1a69aaf89a
|
CM-MERGE:OB13.5.5-10 into 14.1.2
Former-commit-id: 89a8caddbb [formerly 89a8caddbb [formerly d57f7989982a59a546116b63a406294573844039]]
Former-commit-id: ba8d7dbbb7
Former-commit-id: ebdd53742c
|
2014-05-27 13:30:35 -04:00 |
|
Fay.Liang
|
605c976986
|
ASM #596 - Watch wording not properly inserted into some warning products
Change-Id: I7dc223d95f06a6a259e969cfbb8e4bde2f4b9192
Former-commit-id: c007420e22 [formerly c007420e22 [formerly ed8cd169fe0a531d0d83411f7b1afe787088d406]]
Former-commit-id: 4fa60f159a
Former-commit-id: 5d763a0f3d
|
2014-05-23 15:47:50 -04:00 |
|
Steve Harris
|
8b68aea03b
|
Merge branch 'master_14.2.2' (14.2.2-8) into omaha_14.2.2
Former-commit-id: 3ed42be350 [formerly 3ed42be350 [formerly a125cbc03cc5cace25e35b3516c34f9d7060a78e]]
Former-commit-id: acecfd7dfa
Former-commit-id: fdaf7083f5
|
2014-05-22 13:52:02 -05:00 |
|
brian.dyke
|
40660547cf
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 562f53874a [formerly 562f53874a [formerly 59ff65f9d31cef6549ea8912adceb9ed4c7d11f6]]
Former-commit-id: f74b1707f9
Former-commit-id: 69a4d1e3b9
|
2014-05-22 12:46:56 -04:00 |
|
Michael Gamazaychikov
|
55d44735ef
|
ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes).
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85
Former-commit-id: 63409ef272 [formerly 63409ef272 [formerly f3ee76edfd95e9c25eff89d1ecbff9e466b3ca75]]
Former-commit-id: 5bff9f2ac8
Former-commit-id: 134f486069
|
2014-05-21 15:12:08 +01:00 |
|
Brian.Dyke
|
f42d40c3a3
|
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: 2fd18d14d6 [formerly 2fd18d14d6 [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]
Former-commit-id: db68b80bbd
Former-commit-id: ebcaebb28d
|
2014-05-20 14:35:34 -04:00 |
|
Brian.Dyke
|
fe658cb381
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-8 into 14.2.1
Former-commit-id: e5f951bf89 [formerly e5f951bf89 [formerly d9c230fbd50cc5acf1dd5c7c5e775f337de41921]]
Former-commit-id: 8c2cccb930
Former-commit-id: 89d2843610
|
2014-05-20 12:08:29 -04:00 |
|
Brian.Dyke
|
0f5964b03f
|
CM-MERGE:OB13.5.5-9 into 14.1.2
Former-commit-id: 545e7f6ce9 [formerly 545e7f6ce9 [formerly a2e2daca86d7efb28cb4e3eb8b9ef2ac92e1fc22]]
Former-commit-id: abf0f995cd
Former-commit-id: fa13621d8e
|
2014-05-20 11:56:30 -04:00 |
|
Brian.Dyke
|
39d8bd9004
|
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: dbd3bb54e8 [formerly dbd3bb54e8 [formerly 19032f03b1d2166f4afd936bb2b56e0b4851d9f4]]
Former-commit-id: d5a4669fc4
Former-commit-id: f30bd7d9ae
|
2014-05-19 14:07:04 -04:00 |
|
Brian.Dyke
|
c88e8d41b6
|
CM-MERGE:OB13.5.5-8 into 14.1.2
Former-commit-id: b29db01a59 [formerly b29db01a59 [formerly 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470]]
Former-commit-id: 06c2478539
Former-commit-id: 9baa09f4bc
|
2014-05-19 13:26:45 -04:00 |
|
Gang.Zhang
|
b82d8bf6fb
|
ASM #95 - Fix 0.0 for NO DATA Issue caused failed back.
Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac
Former-commit-id: 94fea6748f [formerly 94fea6748f [formerly 5880dcd0b727c3d473873b8382ace78955ab800b]]
Former-commit-id: 9c1587b92d
Former-commit-id: baa1546e39
|
2014-05-19 15:40:41 +01:00 |
|
Brian.Dyke
|
acf4cbbd78
|
CM-MERGE:OB13.5.5-7 into 14.1.2
Former-commit-id: f8ed9c7944 [formerly f8ed9c7944 [formerly 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114]]
Former-commit-id: e9bd17a21f
Former-commit-id: 409a48b907
|
2014-05-19 07:55:42 -04:00 |
|
David Friedman
|
421d4a56c8
|
Merge "ASM #240 - RPS lists delivered by awips2-rcm out of date" into asm_14.2.2
Former-commit-id: c909746e0e [formerly c909746e0e [formerly a4c1c5524c31384c3532076ee151fd9a294367d2]]
Former-commit-id: a55e851780
Former-commit-id: 101f43d875
|
2014-05-16 16:40:38 -05:00 |
|
David Friedman
|
e576ddde57
|
ASM #240 - RPS lists delivered by awips2-rcm out of date
Change-Id: I811bfebab480c5655f7260b85daa36f69e9550eb
Former-commit-id: caa38ec709 [formerly caa38ec709 [formerly 880c5d7259a5af17f2452fa3bd9f18d852c81d82]]
Former-commit-id: eab9a6b6d7
Former-commit-id: 4efaa47d2d
|
2014-05-16 21:38:34 +00:00 |
|
David Friedman
|
f8e5e96774
|
ASM #592 - RadarServer does not sent OTRs for RSS product to TDWRs
Change-Id: Iabb354391ea63b6f9c316ea8316fc28128a956f5
Former-commit-id: 1503bc4162 [formerly 1503bc4162 [formerly 4fd6bbfba29a39bf125269ab8342b826995e3d86]]
Former-commit-id: 3b69a240c8
Former-commit-id: b62ac936ba
|
2014-05-16 21:34:59 +00:00 |
|
Brian.Dyke
|
3b7e8c2c66
|
Merge branch 'omaha_14.2.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1
Former-commit-id: 3183283e99 [formerly 3183283e99 [formerly 18486e2e8ead4614c05e3a7775cba95cd78053c8]]
Former-commit-id: dcd238c6a3
Former-commit-id: 353aebe447
|
2014-05-16 08:45:47 -04:00 |
|
Brian.Dyke
|
17d7291548
|
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: b066572041 [formerly b066572041 [formerly d75db45cdfa20fed7568b825ca0dfd8c8689d22a]]
Former-commit-id: c8f21e92fe
Former-commit-id: 984f56d23c
|
2014-05-15 16:40:47 -04:00 |
|
Brian.Dyke
|
77344c1e1f
|
CM-MERGE:OB13.5.5-6 into 14.1.2
Former-commit-id: 81a1affe22 [formerly 81a1affe22 [formerly 11acfb00bda7686c68e24903df4831cf57bf86de]]
Former-commit-id: c81d54b651
Former-commit-id: cf4eca67af
|
2014-05-15 14:16:38 -04:00 |
|
Steve Harris
|
ba87dbd03f
|
Merge branch 'master_14.2.2' (14.2.2-9) into omaha_14.2.2
Former-commit-id: 85850ed33e [formerly 85850ed33e [formerly b1bf5bdc4a81c55c9cd30ac77857509a2e8f5a08]]
Former-commit-id: a6aa34210c
Former-commit-id: 0ebb502663
|
2014-05-15 08:12:49 -05:00 |
|
Dave Hladky
|
88ebc6921e
|
Issue #3168 Move DD retrieval distibution to correct feature/RPM
Change-Id: I1110eec9d4cde805a67cc33254b98fc00fd8a7b1
Former-commit-id: c72be97b9b [formerly c72be97b9b [formerly d94e7f139573caa508b260902870c9f745080bb8]]
Former-commit-id: 783cd9e308
Former-commit-id: 25c2dd4f7d
|
2014-05-14 16:13:57 -05:00 |
|