Michael Gamazaychikov
|
b3afeb981b
|
ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75
Former-commit-id: efd0fb50b8 [formerly e5a9fa0827] [formerly c07bcacbf8] [formerly efd0fb50b8 [formerly e5a9fa0827] [formerly c07bcacbf8] [formerly 50ab77046b [formerly c07bcacbf8 [formerly a38308fa5a6efe9a07ecd84bd93662bea32afc94]]]]
Former-commit-id: 50ab77046b
Former-commit-id: fc5acb6bcb [formerly a2423cfadc] [formerly a99f478987db9b40c18652f3f209154a8dfc3177 [formerly 5efb82ea3e]]
Former-commit-id: 177375df5384d0a8fa51c23b24915e671ade7ce1 [formerly 29e197404f]
Former-commit-id: 94595e6af4
|
2014-06-05 13:43:04 +01:00 |
|
Zhidong.Hao
|
e842be1d53
|
ASM #106 - AvnFPS Monitor TAF valid time display different from A1
Change-Id: Iddf3f4ee46b94f28494dc15764b91f38c0176325
Former-commit-id: 43e1a5a909 [formerly ccbda4db4f] [formerly 26c6801620] [formerly 43e1a5a909 [formerly ccbda4db4f] [formerly 26c6801620] [formerly 71ab6b9ed0 [formerly 26c6801620 [formerly 74597b2630ffd8d984b193f72126a9a5d0b3a942]]]]
Former-commit-id: 71ab6b9ed0
Former-commit-id: 460b543c6d [formerly 9094e822e0] [formerly c17aa2176430d3a612529390ab4b68f86ac03181 [formerly e5c47a51eb]]
Former-commit-id: 16d700e0af2365b3ff5388b53260c131a361d620 [formerly 3a9abec04b]
Former-commit-id: 33086a8085
|
2014-06-03 11:55:32 -04:00 |
|
brian.dyke
|
37b3baed83
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: e1f9c919e6 [formerly 2f53c2e385] [formerly 7dde6e1d04] [formerly e1f9c919e6 [formerly 2f53c2e385] [formerly 7dde6e1d04] [formerly ee7c67f7b0 [formerly 7dde6e1d04 [formerly d7b707236a1ee3bca45dee26c10814d9e3c275c8]]]]
Former-commit-id: ee7c67f7b0
Former-commit-id: b2b232c2cc [formerly 8b93c973d6] [formerly 5b345e8fad1dba7b952e789980e9a6f6873f05eb [formerly cf49a7217f]]
Former-commit-id: 1c3c352f258fa1fe750be56c373b425249190beb [formerly 05f691d0cd]
Former-commit-id: a5b2f384bf
|
2014-05-30 10:07:12 -04:00 |
|
Matthew Howard
|
904a3b24f7
|
Merge "ASM #209 - Fix Svcbu cleanup script" into asm_14.2.2
Former-commit-id: d0880003a6 [formerly 099185c960] [formerly 781d0331ab] [formerly d0880003a6 [formerly 099185c960] [formerly 781d0331ab] [formerly 8375a2af3e [formerly 781d0331ab [formerly def2351f527613dd62a081161e5f3a87756493ec]]]]
Former-commit-id: 8375a2af3e
Former-commit-id: b7f3c5798e [formerly 11216ced25] [formerly d46f8a355df86411c1f5283003df72a741dbec12 [formerly f68748bd63]]
Former-commit-id: 46ac2ea21d50d92b8371c417dd9b8efffd8f82a9 [formerly 04c0631701]
Former-commit-id: db35baefc8
|
2014-05-29 15:54:37 -05:00 |
|
Shawn.Hooper
|
8fe8f54975
|
ASM #209 - Fix Svcbu cleanup script
Change-Id: I4da44d4c410c03769e556dc6abca62db52880997
Former-commit-id: 4de35d0a2b [formerly 08ad9a66cc] [formerly fe567b2a5b] [formerly 4de35d0a2b [formerly 08ad9a66cc] [formerly fe567b2a5b] [formerly 5cf0579d20 [formerly fe567b2a5b [formerly 626ee991cd7e9dbfe52342abd9e3fd41b973f72a]]]]
Former-commit-id: 5cf0579d20
Former-commit-id: 94ec109216 [formerly 0fe034cc8b] [formerly 1363ea6a68426295d8f737eab6b4aff6d84a7400 [formerly 2c476e2bb4]]
Former-commit-id: 5db8829a63e68c0d2815ce3a3cb52cffe50787a0 [formerly 3cb14aecd9]
Former-commit-id: a4de244bdb
|
2014-05-29 16:56:46 -04:00 |
|
Steve Harris
|
265c5e4811
|
Merge branch 'master_14.2.2' (14.2.2-9,10,11) into omaha_14.2.2
Former-commit-id: 74b0099fdf [formerly 53645445fe] [formerly c7ef7878f5] [formerly 74b0099fdf [formerly 53645445fe] [formerly c7ef7878f5] [formerly 9313e045bf [formerly c7ef7878f5 [formerly 03b376033b3374694bc8a6e0a2c55b830db058e1]]]]
Former-commit-id: 9313e045bf
Former-commit-id: 774a5c516c [formerly 947d44c945] [formerly 67033e82aff16def433329064a8788daafb7920f [formerly e92b927c5a]]
Former-commit-id: 75fff8fc4c85753165134554cdcdbacca2a82acc [formerly ba06fa79f9]
Former-commit-id: 0571a7877b
|
2014-05-29 07:45:24 -05:00 |
|
Brian.Dyke
|
9784438847
|
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: 9e0cf9b945 [formerly 47a37b112a] [formerly b7ef9420e1] [formerly 9e0cf9b945 [formerly 47a37b112a] [formerly b7ef9420e1] [formerly 574246b6d4 [formerly b7ef9420e1 [formerly f2763f73cf3e5f2d9e66efa6e481dbf66f16e7da]]]]
Former-commit-id: 574246b6d4
Former-commit-id: 7d8cb95e95 [formerly 45d59380ea] [formerly 8dc10058004612f82f3168b336f93c36d1945933 [formerly 2c1fabb0f8]]
Former-commit-id: c03dd203d258e405f3ff9771fe66b95d7dbeaaea [formerly 551def9f1a]
Former-commit-id: 1bae94a61a
|
2014-05-28 16:25:33 -04:00 |
|
Brian.Dyke
|
ee83737427
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-10 into 14.2.1
Former-commit-id: 0fe87c550c [formerly 6f64664e70] [formerly 4c010cf27a] [formerly 0fe87c550c [formerly 6f64664e70] [formerly 4c010cf27a] [formerly ce81b44f32 [formerly 4c010cf27a [formerly b92ce0c1589c48de73387c142f1302409a3b0cb7]]]]
Former-commit-id: ce81b44f32
Former-commit-id: 90a397bd7e [formerly 4f434e1bf9] [formerly 1509b1f949c311ae098b3a9a2397fccd0508dc1c [formerly 73ec45c5b2]]
Former-commit-id: d276945aa3a9c7c155010ce4bc7455ff38448cbc [formerly f5bc17ef24]
Former-commit-id: 992186e641
|
2014-05-28 09:36:15 -04:00 |
|
Brian.Dyke
|
05c094d6f9
|
CM-MERGE:OB13.5.5-11 into 14.1.2
Former-commit-id: fba5604613 [formerly 089b2559bb] [formerly e95ee60224] [formerly fba5604613 [formerly 089b2559bb] [formerly e95ee60224] [formerly e852623f48 [formerly e95ee60224 [formerly c85d4369600bfc24405386aa71713d7f2d58b201]]]]
Former-commit-id: e852623f48
Former-commit-id: 4400514725 [formerly f07b83ce91] [formerly e2442f94c9c8f1691bd70abcf54b5b626473d3de [formerly b745ac5926]]
Former-commit-id: 81d8abdb8531e95eb3a0bcb835f669e7a5037729 [formerly 21112face5]
Former-commit-id: befec4cf01
|
2014-05-28 08:40:56 -04:00 |
|
Brian.Dyke
|
9339e1d334
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-9 into 14.2.1
Former-commit-id: f3b0bdff29 [formerly ea618935d0] [formerly 575cebda84] [formerly f3b0bdff29 [formerly ea618935d0] [formerly 575cebda84] [formerly 638acc2c06 [formerly 575cebda84 [formerly 34c582add16be1620f400d78d2f37da8c534f71a]]]]
Former-commit-id: 638acc2c06
Former-commit-id: f30eefeda4 [formerly 2ab1fc6ddf] [formerly 05ba75929061ec2ce7acb3c93b8c5d42ef107834 [formerly 290b85b556]]
Former-commit-id: 7fc30cfb987148987dd92b3d01e3a3049445c44c [formerly 09f2d8b8b1]
Former-commit-id: d078a2630e
|
2014-05-27 13:42:09 -04:00 |
|
Brian.Dyke
|
d3a6a77351
|
CM-MERGE:OB13.5.5-10 into 14.1.2
Former-commit-id: 86eefc2026 [formerly 4a1b6d70c4] [formerly 89a8caddbb] [formerly 86eefc2026 [formerly 4a1b6d70c4] [formerly 89a8caddbb] [formerly ba8d7dbbb7 [formerly 89a8caddbb [formerly d57f7989982a59a546116b63a406294573844039]]]]
Former-commit-id: ba8d7dbbb7
Former-commit-id: 90cf8cd426 [formerly bb5d88be66] [formerly ddbd59370c87b39e43f9f08800b6f899c79a9f83 [formerly ebdd53742c]]
Former-commit-id: 396b767d5da65f7b066a5f0b100e2c3770df5813 [formerly 1a69aaf89a]
Former-commit-id: 7e5475923c
|
2014-05-27 13:30:35 -04:00 |
|
Fay.Liang
|
09bf017894
|
ASM #596 - Watch wording not properly inserted into some warning products
Change-Id: I7dc223d95f06a6a259e969cfbb8e4bde2f4b9192
Former-commit-id: 61c177c7b2 [formerly 17f1404221] [formerly c007420e22] [formerly 61c177c7b2 [formerly 17f1404221] [formerly c007420e22] [formerly 4fa60f159a [formerly c007420e22 [formerly ed8cd169fe0a531d0d83411f7b1afe787088d406]]]]
Former-commit-id: 4fa60f159a
Former-commit-id: 5e77392ab7 [formerly 3ed3e2249d] [formerly 8d8e3635fce79ec738b4c75ee9ff6d33751dd44e [formerly 5d763a0f3d]]
Former-commit-id: 144705b862a68adbc7f6bb69846df6926ebe33de [formerly 605c976986]
Former-commit-id: 2ac429bff7
|
2014-05-23 15:47:50 -04:00 |
|
Steve Harris
|
a2ee4d0706
|
Merge branch 'master_14.2.2' (14.2.2-8) into omaha_14.2.2
Former-commit-id: 7b9e17582c [formerly 1e34c7eda3] [formerly 3ed42be350] [formerly 7b9e17582c [formerly 1e34c7eda3] [formerly 3ed42be350] [formerly acecfd7dfa [formerly 3ed42be350 [formerly a125cbc03cc5cace25e35b3516c34f9d7060a78e]]]]
Former-commit-id: acecfd7dfa
Former-commit-id: 90b1631c3a [formerly efafb08e74] [formerly 6822edbc09ceb4a447389a31731027b78a6cf212 [formerly fdaf7083f5]]
Former-commit-id: 8aa2bc42dd952237933e1dcd297ff41e18568556 [formerly 8b68aea03b]
Former-commit-id: 4a2ed02d2c
|
2014-05-22 13:52:02 -05:00 |
|
brian.dyke
|
baa0b53942
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: ed62e77a57 [formerly f405e8c89c] [formerly 562f53874a] [formerly ed62e77a57 [formerly f405e8c89c] [formerly 562f53874a] [formerly f74b1707f9 [formerly 562f53874a [formerly 59ff65f9d31cef6549ea8912adceb9ed4c7d11f6]]]]
Former-commit-id: f74b1707f9
Former-commit-id: a4ade097f7 [formerly ab985767bd] [formerly 3a90970de36c174b3d02e2cc523d82dcac4a7768 [formerly 69a4d1e3b9]]
Former-commit-id: 72a2e2d8091afbd8fc3249fa01ea9e8ae03904a5 [formerly 40660547cf]
Former-commit-id: 974b796441
|
2014-05-22 12:46:56 -04:00 |
|
Michael Gamazaychikov
|
a8672786bf
|
ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes).
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85
Former-commit-id: b3d76892d1 [formerly 8ae5d535de] [formerly 63409ef272] [formerly b3d76892d1 [formerly 8ae5d535de] [formerly 63409ef272] [formerly 5bff9f2ac8 [formerly 63409ef272 [formerly f3ee76edfd95e9c25eff89d1ecbff9e466b3ca75]]]]
Former-commit-id: 5bff9f2ac8
Former-commit-id: b499ee2828 [formerly 0d38d04dad] [formerly 3f60fc9aefaa49ce841bebfd87ef42af677038af [formerly 134f486069]]
Former-commit-id: de7589ac82c2fe4ab8fce61c3a0e6a30b30502d2 [formerly 55d44735ef]
Former-commit-id: 0217549622
|
2014-05-21 15:12:08 +01:00 |
|
Brian.Dyke
|
4671c25ea4
|
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: 5afaee3d33 [formerly 822ad181bf] [formerly 2fd18d14d6] [formerly 5afaee3d33 [formerly 822ad181bf] [formerly 2fd18d14d6] [formerly db68b80bbd [formerly 2fd18d14d6 [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]]]
Former-commit-id: db68b80bbd
Former-commit-id: 5a07e9c984 [formerly 937b9bb9ce] [formerly 6fbbfc0267046011d5fd8ba4c15aa6b2ab182188 [formerly ebcaebb28d]]
Former-commit-id: 6e138f1746a6c0aa092e3c298cd91ece951e39d3 [formerly f42d40c3a3]
Former-commit-id: b0b377e811
|
2014-05-20 14:35:34 -04:00 |
|
Brian.Dyke
|
8ad7621cbc
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-8 into 14.2.1
Former-commit-id: 9426ddb9a9 [formerly 88a5ecefaa] [formerly e5f951bf89] [formerly 9426ddb9a9 [formerly 88a5ecefaa] [formerly e5f951bf89] [formerly 8c2cccb930 [formerly e5f951bf89 [formerly d9c230fbd50cc5acf1dd5c7c5e775f337de41921]]]]
Former-commit-id: 8c2cccb930
Former-commit-id: 7b6988aa0b [formerly bb2089f2df] [formerly a2965f6fcb55c7bf469752a36f14c13683c6f1bd [formerly 89d2843610]]
Former-commit-id: fbb79af68eeeaa91cfaddc4aea1e0b429540ecca [formerly fe658cb381]
Former-commit-id: 774897735a
|
2014-05-20 12:08:29 -04:00 |
|
Brian.Dyke
|
2eca58ce8d
|
CM-MERGE:OB13.5.5-9 into 14.1.2
Former-commit-id: c9ef80beeb [formerly 8435ace4f8] [formerly 545e7f6ce9] [formerly c9ef80beeb [formerly 8435ace4f8] [formerly 545e7f6ce9] [formerly abf0f995cd [formerly 545e7f6ce9 [formerly a2e2daca86d7efb28cb4e3eb8b9ef2ac92e1fc22]]]]
Former-commit-id: abf0f995cd
Former-commit-id: 1f0f7de4c5 [formerly 9af8951a2a] [formerly af49ed0701c5a48e77ad4fbbb9da056ebd4f6592 [formerly fa13621d8e]]
Former-commit-id: 9310164288d45c3f9652b0aabd8948d3ef0e220c [formerly 0f5964b03f]
Former-commit-id: 5d6603320b
|
2014-05-20 11:56:30 -04:00 |
|
Brian.Dyke
|
be5e377068
|
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: 432e5f15a5 [formerly c4b7b8dd74] [formerly dbd3bb54e8] [formerly 432e5f15a5 [formerly c4b7b8dd74] [formerly dbd3bb54e8] [formerly d5a4669fc4 [formerly dbd3bb54e8 [formerly 19032f03b1d2166f4afd936bb2b56e0b4851d9f4]]]]
Former-commit-id: d5a4669fc4
Former-commit-id: f113398a16 [formerly f2885c9996] [formerly 9eb0d56ad4743d868045273e945e80f0d2e0674f [formerly f30bd7d9ae]]
Former-commit-id: b203c0e47900941c64b4992284bdc8701c374b29 [formerly 39d8bd9004]
Former-commit-id: 3d35be33cb
|
2014-05-19 14:07:04 -04:00 |
|
Brian.Dyke
|
be2b29e0f3
|
CM-MERGE:OB13.5.5-8 into 14.1.2
Former-commit-id: 75f7d77c45 [formerly 2eae2be646] [formerly b29db01a59] [formerly 75f7d77c45 [formerly 2eae2be646] [formerly b29db01a59] [formerly 06c2478539 [formerly b29db01a59 [formerly 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470]]]]
Former-commit-id: 06c2478539
Former-commit-id: 534d211494 [formerly 3558d8f162] [formerly 8d732a149cd7483006dfc9f0e4e9c03c2adcc03f [formerly 9baa09f4bc]]
Former-commit-id: 976e0f4a32e004b04954001cee7a9831fc35972a [formerly c88e8d41b6]
Former-commit-id: b65a3a3214
|
2014-05-19 13:26:45 -04:00 |
|
Gang.Zhang
|
f029bd627d
|
ASM #95 - Fix 0.0 for NO DATA Issue caused failed back.
Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac
Former-commit-id: 98e50ae694 [formerly 6e034005e0] [formerly 94fea6748f] [formerly 98e50ae694 [formerly 6e034005e0] [formerly 94fea6748f] [formerly 9c1587b92d [formerly 94fea6748f [formerly 5880dcd0b727c3d473873b8382ace78955ab800b]]]]
Former-commit-id: 9c1587b92d
Former-commit-id: 03dfdaffd4 [formerly ec6053c3f7] [formerly cf5b27d037d8ebdd2e427efe07f404e425a82240 [formerly baa1546e39]]
Former-commit-id: b3045b8c7359818619329a1fdacbf426709f3318 [formerly b82d8bf6fb]
Former-commit-id: 7cd2402325
|
2014-05-19 15:40:41 +01:00 |
|
Brian.Dyke
|
0545cfd2f6
|
CM-MERGE:OB13.5.5-7 into 14.1.2
Former-commit-id: a9f2fdb086 [formerly 509616ba6a] [formerly f8ed9c7944] [formerly a9f2fdb086 [formerly 509616ba6a] [formerly f8ed9c7944] [formerly e9bd17a21f [formerly f8ed9c7944 [formerly 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114]]]]
Former-commit-id: e9bd17a21f
Former-commit-id: 3772c8d2bf [formerly e563eb3376] [formerly d77fe7357769ccd29689730a70de23400e90fee7 [formerly 409a48b907]]
Former-commit-id: ffcdc5842385a946631a64cb44a2f992361237b3 [formerly acf4cbbd78]
Former-commit-id: eefa4dbf96
|
2014-05-19 07:55:42 -04:00 |
|
David Friedman
|
cdd250c2df
|
Merge "ASM #240 - RPS lists delivered by awips2-rcm out of date" into asm_14.2.2
Former-commit-id: 99edfe0a17 [formerly a920c5a5e4] [formerly c909746e0e] [formerly 99edfe0a17 [formerly a920c5a5e4] [formerly c909746e0e] [formerly a55e851780 [formerly c909746e0e [formerly a4c1c5524c31384c3532076ee151fd9a294367d2]]]]
Former-commit-id: a55e851780
Former-commit-id: 57712d2038 [formerly f8c9026f79] [formerly bee35b0f50c15c2acee4d04f32450273a1e35f20 [formerly 101f43d875]]
Former-commit-id: 8add7e0f674985ab73fd82e03a1a771477439c2f [formerly 421d4a56c8]
Former-commit-id: f999df6859
|
2014-05-16 16:40:38 -05:00 |
|
David Friedman
|
e4ec928222
|
ASM #240 - RPS lists delivered by awips2-rcm out of date
Change-Id: I811bfebab480c5655f7260b85daa36f69e9550eb
Former-commit-id: a13190aeb9 [formerly b462660d75] [formerly caa38ec709] [formerly a13190aeb9 [formerly b462660d75] [formerly caa38ec709] [formerly eab9a6b6d7 [formerly caa38ec709 [formerly 880c5d7259a5af17f2452fa3bd9f18d852c81d82]]]]
Former-commit-id: eab9a6b6d7
Former-commit-id: d06f8def65 [formerly 81abf8e7d9] [formerly 5fa6cc8307089b8f052ac6ad0cfa79f0362dc0ab [formerly 4efaa47d2d]]
Former-commit-id: 80202f6447063c949a9a1aa3353a7e14f3d4094a [formerly e576ddde57]
Former-commit-id: fa63aea622
|
2014-05-16 21:38:34 +00:00 |
|
David Friedman
|
3ea4f1dc1b
|
ASM #592 - RadarServer does not sent OTRs for RSS product to TDWRs
Change-Id: Iabb354391ea63b6f9c316ea8316fc28128a956f5
Former-commit-id: 39e412aac8 [formerly 404f3af49e] [formerly 1503bc4162] [formerly 39e412aac8 [formerly 404f3af49e] [formerly 1503bc4162] [formerly 3b69a240c8 [formerly 1503bc4162 [formerly 4fd6bbfba29a39bf125269ab8342b826995e3d86]]]]
Former-commit-id: 3b69a240c8
Former-commit-id: 3a6e887a7c [formerly ff0f8e731f] [formerly ab442fed2bdf78f10c432839c809a8791bac6aed [formerly b62ac936ba]]
Former-commit-id: 21090d6cbb605d49bb525d9b72ed9817b4fb6d94 [formerly f8e5e96774]
Former-commit-id: 32524f8d3c
|
2014-05-16 21:34:59 +00:00 |
|
Brian.Dyke
|
40f8656824
|
Merge branch 'omaha_14.2.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1
Former-commit-id: 99e1c53457 [formerly c2afc26206] [formerly 3183283e99] [formerly 99e1c53457 [formerly c2afc26206] [formerly 3183283e99] [formerly dcd238c6a3 [formerly 3183283e99 [formerly 18486e2e8ead4614c05e3a7775cba95cd78053c8]]]]
Former-commit-id: dcd238c6a3
Former-commit-id: fb776b4091 [formerly 4a37cd32bd] [formerly ec4e89f93aee5394b38539a722d1331582a6eb6f [formerly 353aebe447]]
Former-commit-id: bb99efa86111dcde4e9407416c5902c94eb89fed [formerly 3b7e8c2c66]
Former-commit-id: 529febf986
|
2014-05-16 08:45:47 -04:00 |
|
Brian.Dyke
|
bb71483e38
|
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: f9a40a24e3 [formerly 2de7de6378] [formerly b066572041] [formerly f9a40a24e3 [formerly 2de7de6378] [formerly b066572041] [formerly c8f21e92fe [formerly b066572041 [formerly d75db45cdfa20fed7568b825ca0dfd8c8689d22a]]]]
Former-commit-id: c8f21e92fe
Former-commit-id: fc476a1286 [formerly 7cc4e0258d] [formerly 24586b50613dc8d4739299b6e8346907dcc7c9c1 [formerly 984f56d23c]]
Former-commit-id: fe64de1e302eac38e0e4ddadb14f850e2fc849b8 [formerly 17d7291548]
Former-commit-id: 43210259de
|
2014-05-15 16:40:47 -04:00 |
|
Brian.Dyke
|
fee860b080
|
CM-MERGE:OB13.5.5-6 into 14.1.2
Former-commit-id: ac7b375d91 [formerly 08f69fd3a1] [formerly 81a1affe22] [formerly ac7b375d91 [formerly 08f69fd3a1] [formerly 81a1affe22] [formerly c81d54b651 [formerly 81a1affe22 [formerly 11acfb00bda7686c68e24903df4831cf57bf86de]]]]
Former-commit-id: c81d54b651
Former-commit-id: cc09a85660 [formerly fe9ee785b6] [formerly ba771ce0e5ca8e2a54ee28250070016a434fb6dc [formerly cf4eca67af]]
Former-commit-id: fe9511cd130e36a1d2520f1222e0d8300e6da5c7 [formerly 77344c1e1f]
Former-commit-id: 33211da425
|
2014-05-15 14:16:38 -04:00 |
|
Steve Harris
|
39c49a5f8f
|
Merge branch 'master_14.2.2' (14.2.2-9) into omaha_14.2.2
Former-commit-id: e05747f71e [formerly 01a6ce5b9b] [formerly 85850ed33e] [formerly e05747f71e [formerly 01a6ce5b9b] [formerly 85850ed33e] [formerly a6aa34210c [formerly 85850ed33e [formerly b1bf5bdc4a81c55c9cd30ac77857509a2e8f5a08]]]]
Former-commit-id: a6aa34210c
Former-commit-id: 758f07fea0 [formerly 9496e2ccdc] [formerly 09d30738acbd13c4f3f0780bc4acb3c739421998 [formerly 0ebb502663]]
Former-commit-id: 00f8adf90bd3b806c7c9b1a10eb64bc6e33822c6 [formerly ba87dbd03f]
Former-commit-id: 2f537f102e
|
2014-05-15 08:12:49 -05:00 |
|
Dave Hladky
|
d4046a9dfe
|
Issue #3168 Move DD retrieval distibution to correct feature/RPM
Change-Id: I1110eec9d4cde805a67cc33254b98fc00fd8a7b1
Former-commit-id: 0e73a4d2a8 [formerly 3b544c74b6] [formerly c72be97b9b] [formerly 0e73a4d2a8 [formerly 3b544c74b6] [formerly c72be97b9b] [formerly 783cd9e308 [formerly c72be97b9b [formerly d94e7f139573caa508b260902870c9f745080bb8]]]]
Former-commit-id: 783cd9e308
Former-commit-id: 8248c69492 [formerly 971910f7fc] [formerly 86951af90c14b8faa6f0c72f4a63cc9c73be2211 [formerly 25c2dd4f7d]]
Former-commit-id: 83ad1d6914a482b12087c4ed7477ccc1404ba0a1 [formerly 88ebc6921e]
Former-commit-id: 7868ab0891
|
2014-05-14 16:13:57 -05:00 |
|
Brian.Dyke
|
0febfec9e7
|
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: 8c0709798d [formerly f38d0138e6] [formerly 627541512d] [formerly 8c0709798d [formerly f38d0138e6] [formerly 627541512d] [formerly d3fa10028c [formerly 627541512d [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]]]
Former-commit-id: d3fa10028c
Former-commit-id: a6b42a776b [formerly b0837b4905] [formerly 91d88625eae6852df94fbb04133d89826c605aad [formerly 68f3a0169e]]
Former-commit-id: c54c6441e46c95271889db670ff46e1bedce8459 [formerly f87775928f]
Former-commit-id: 1d53f6d304
|
2014-05-14 16:08:16 -04:00 |
|
Shawn Hooper
|
329c115f61
|
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: 183109f238 [formerly 3143b15d26] [formerly 2fe0c47c6d] [formerly 183109f238 [formerly 3143b15d26] [formerly 2fe0c47c6d] [formerly 24918bda30 [formerly 2fe0c47c6d [formerly b774242fcff4bf603b82c8a6657e372d8bdc3c19]]]]
Former-commit-id: 24918bda30
Former-commit-id: 5c85790b1a [formerly 93977713d5] [formerly 09fb99b46539c0e3080552d805df6a73630991ad [formerly e70f2dd6fa]]
Former-commit-id: d9643a730ec986a210bb4b40bbd671f00d9ec461 [formerly f684b16dcd]
Former-commit-id: 5106bea20c
|
2014-05-14 14:39:57 -05:00 |
|
Dave Hladky
|
f640ba1eeb
|
Issue #3168 Move retrieval distribution to correct DD RPM
Former-commit-id: 6a80ab5dfb [formerly 40c24180cf] [formerly ca644b93ee] [formerly 6a80ab5dfb [formerly 40c24180cf] [formerly ca644b93ee] [formerly 15366714ed [formerly ca644b93ee [formerly 228ef1ceb7337fa38c370c3218d1c32b4f1302fb]]]]
Former-commit-id: 15366714ed
Former-commit-id: 02b2c05d0f [formerly f878ccb04e] [formerly 45e1e810677500f358f651b3e5c5e4eb36b9a380 [formerly 268765da81]]
Former-commit-id: 73f6de0ebf8291c21795f1249a9c5a88c06f7da6 [formerly 16a5eed943]
Former-commit-id: cc7a9bce10
|
2014-05-14 11:12:55 -05:00 |
|
Steve Harris
|
caaa13555f
|
Merge branch 'master_14.2.2' (14.2.2-8) into omaha_14.2.2
Former-commit-id: 293dafa266 [formerly bef1d9681c] [formerly 2247a499c4] [formerly 293dafa266 [formerly bef1d9681c] [formerly 2247a499c4] [formerly f5bc8e598b [formerly 2247a499c4 [formerly a2f35d52b5ffbf2fee8bd953eb795810972e4e53]]]]
Former-commit-id: f5bc8e598b
Former-commit-id: 0923a4a1a2 [formerly db6ea622c8] [formerly 8454f26a92d83110bd349b9d0126dc9e2e9349c1 [formerly 4672bea191]]
Former-commit-id: c128e0af02d64f83035cbad73cd46d19b65fa6ac [formerly 1eaf158cad]
Former-commit-id: 2bdb2197a7
|
2014-05-13 15:32:39 -05:00 |
|
Steve Harris
|
8094b08c85
|
Merge branch 'master_14.2.1' (14.2.1-24) into omaha_14.2.1
Former-commit-id: 2441e29987 [formerly 462609aa3f] [formerly c2efe26c11] [formerly 2441e29987 [formerly 462609aa3f] [formerly c2efe26c11] [formerly 70b95c7636 [formerly c2efe26c11 [formerly 2627e4d38b3dcee82dcf7a6032d692170d50d9ad]]]]
Former-commit-id: 70b95c7636
Former-commit-id: 5e4d9f666a [formerly 29ecfa91cb] [formerly 3673c0fa579962cf3044e6137a5507dc3bb4de20 [formerly 667dff3919]]
Former-commit-id: e594bb821ece4ea9a92f332eaab265eb722f2b1a [formerly 292bb044a8]
Former-commit-id: 80d1cec3ec
|
2014-05-13 15:23:57 -05:00 |
|
Brian.Dyke
|
db6b79a08f
|
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: e705786d12 [formerly 5a2e0c7e1b] [formerly e95bc87a19] [formerly e705786d12 [formerly 5a2e0c7e1b] [formerly e95bc87a19] [formerly fb4c7e55b3 [formerly e95bc87a19 [formerly 019c1405290753ed47cecd9a0bb26c220d78d010]]]]
Former-commit-id: fb4c7e55b3
Former-commit-id: bdbb6ec0fe [formerly f9474b087e] [formerly adafd612a1e8c387205bf9a2e7dcfd2a03d117c9 [formerly 0311366ffb]]
Former-commit-id: 4d9e420076ab9a3d2cb731f4d97896138289b45b [formerly 3b7a2f1645]
Former-commit-id: 4cedfadd77
|
2014-05-13 11:23:55 -04:00 |
|
Steve Harris
|
24df80c520
|
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: 343444715e [formerly 848519177d] [formerly cf62cf4a6e] [formerly 343444715e [formerly 848519177d] [formerly cf62cf4a6e] [formerly fc2bf6b45c [formerly cf62cf4a6e [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]]]
Former-commit-id: fc2bf6b45c
Former-commit-id: ae2d525c8a [formerly 32f255cada] [formerly a8635bd2e1fdd0fe84e47c2435e9f0073d86e4e2 [formerly 233922471a]]
Former-commit-id: d12e1920a9ce76da64ae45fed23fe5b2ed9fa884 [formerly 74a325ce74]
Former-commit-id: 82045e2409
|
2014-05-12 16:13:19 -05:00 |
|
Brian.Dyke
|
9bc1055c87
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 82ce970ad6 [formerly 3aa2f7974b] [formerly 386ec058e1] [formerly 82ce970ad6 [formerly 3aa2f7974b] [formerly 386ec058e1] [formerly 41ba5fc348 [formerly 386ec058e1 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]]]
Former-commit-id: 41ba5fc348
Former-commit-id: 4004b627e2 [formerly dc5bc1d2a4] [formerly 3193dce8b50276edb5c6e0829236339aa91b9172 [formerly 2f704c898d]]
Former-commit-id: 4b5ff1e5a8372daadb66b3b58132714ed0a54eae [formerly 82663c0ab6]
Former-commit-id: 464cc1a479
|
2014-05-12 14:07:11 -04:00 |
|
Ben Steffensmeier
|
e5f61fe0b8
|
Issue #2289 Fix TempOfTe at small pressure values.
Former-commit-id: b2d89eae80 [formerly d051416c76] [formerly 2754326906] [formerly b2d89eae80 [formerly d051416c76] [formerly 2754326906] [formerly 102d560686 [formerly 2754326906 [formerly a114bf15018ab86ec1511c13704fd6e1e3feed99]]]]
Former-commit-id: 102d560686
Former-commit-id: 5a3a22e222 [formerly 763d8ef96f] [formerly 2b99b27378f8db1ef1ba538130d9ab1f354e5f81 [formerly d55535c36c]]
Former-commit-id: e6e92e33f205a857d75468b23d2fe4e70ff32d4b [formerly 3290f7ee59]
Former-commit-id: 54487dede7
|
2014-05-12 10:11:34 -05:00 |
|
Gang.Zhang
|
7813539881
|
ASM #589 - Fix FFMP Templates generation issue
Change-Id: Ia3715ccb03113f3d2528e516c2568255935f4086
Former-commit-id: 9a1ba6435f [formerly fe742a06b9] [formerly f771c8fed4] [formerly 9a1ba6435f [formerly fe742a06b9] [formerly f771c8fed4] [formerly 165b953b5c [formerly f771c8fed4 [formerly 560a3cc5ac5e9e059b581294e48e69a9978272e5]]]]
Former-commit-id: 165b953b5c
Former-commit-id: 0df353adef [formerly b5622c5a5e] [formerly c52cb3d752f4e837e43da31aafc2b34121b20bdc [formerly c4b32db009]]
Former-commit-id: 4d8f77319f31888fa2ee502eae244ce728293a6d [formerly 561169825f]
Former-commit-id: 6c46d5323e
|
2014-05-09 11:51:18 +01:00 |
|
David Gillingham
|
160aacc111
|
Issue #3142: Improve error-handling and logging in CleanupGfeHDF5Storage delta script.
Change-Id: I5c75cfb44654781a53f4588236f5d5d562432615
Former-commit-id: 39266d563f [formerly 720993104c] [formerly 9ebbf783df] [formerly 39266d563f [formerly 720993104c] [formerly 9ebbf783df] [formerly 29072aa824 [formerly 9ebbf783df [formerly 920999bda9dda329e71359ab46872130f45d298c]]]]
Former-commit-id: 29072aa824
Former-commit-id: dfe3d2d467 [formerly 800438edc0] [formerly bbc219d6a0b4a04af16b25b53aa80a7784f5dba1 [formerly 1769a52111]]
Former-commit-id: 67a88d860b32cecf8811ae2bd18b3868389a1782 [formerly 36684955e5]
Former-commit-id: 1a3d0a9413
|
2014-05-08 16:51:41 -05:00 |
|
Ben Steffensmeier
|
0400944d82
|
Issue #3119 Optimize plot rendering.
Former-commit-id: 4ae6884a41 [formerly a19a5bf986] [formerly d7cb05fd92] [formerly 4ae6884a41 [formerly a19a5bf986] [formerly d7cb05fd92] [formerly 7274d01d64 [formerly d7cb05fd92 [formerly 006df5b77f8f09e0b083b3c3e644744653f3d269]]]]
Former-commit-id: 7274d01d64
Former-commit-id: 00d70af6ef [formerly bd08996223] [formerly 60fa5670414d35cc5d89b6666c6faf0458710ed9 [formerly 9701f68f40]]
Former-commit-id: dc49dfe6a957d46ddf6224c15de152ff236e8ef8 [formerly 9274027a7a]
Former-commit-id: 0d52351d27
|
2014-05-07 13:27:48 -05:00 |
|
Brian.Dyke
|
1610b63c31
|
Merged 13.5.5 -4 into 1412
Former-commit-id: dd9f977f4f [formerly 5a6425b6b0] [formerly f27d1b1efe] [formerly dd9f977f4f [formerly 5a6425b6b0] [formerly f27d1b1efe] [formerly 30bbd2d1cd [formerly f27d1b1efe [formerly 5644361dffaae25c63748a52c23506907210c741]]]]
Former-commit-id: 30bbd2d1cd
Former-commit-id: 2f197353c2 [formerly 4155179c42] [formerly 7b5d2a80fe03ddd0ccf8f85a382a8463781d3d7d [formerly 8bf824a625]]
Former-commit-id: db8866e8f93d4899a510e08b96239c6082e50aa5 [formerly e0cd200cee]
Former-commit-id: 0daec2c83b
|
2014-05-07 13:07:15 -04:00 |
|
Steve Harris
|
96bd49cc22
|
Merge branch 'master_14.2.1' (14.2.1-23) into omaha_14.2.1
Former-commit-id: bffbcf61b8 [formerly a7211a72f0] [formerly c3509757f0] [formerly bffbcf61b8 [formerly a7211a72f0] [formerly c3509757f0] [formerly 0392577b6c [formerly c3509757f0 [formerly 575adeb94784b32ac0d89e3c4dd506c2fe500266]]]]
Former-commit-id: 0392577b6c
Former-commit-id: d191cc2ebd [formerly 8c5eb7774e] [formerly 9abd56b89aacb0711cf15f70eebafb12f9e5773d [formerly 6694af2d5e]]
Former-commit-id: 9da9bed1e53505b39d613806127348e6f88a3c1d [formerly 7819c2878f]
Former-commit-id: ab4d7cc569
|
2014-05-07 08:45:41 -05:00 |
|
Ron Anderson
|
1de70ff00b
|
Issue #3129 Change smartInit back to 1 thread on 64-bit
Change-Id: Ie1e17e145d2d88485d91a29e4c74c737e4658038
Former-commit-id: 5c0b04b00f [formerly 6c5f1a9ed3] [formerly b43e6d64c3] [formerly 5c0b04b00f [formerly 6c5f1a9ed3] [formerly b43e6d64c3] [formerly 32c95e50a7 [formerly b43e6d64c3 [formerly f2e15f4ab034f617a3a64814125dfee73b5070ac]]]]
Former-commit-id: 32c95e50a7
Former-commit-id: 679c56b13c [formerly 4a8b1296ea] [formerly e00d6110ed92bf62013fa5e8a2aa8c6a54034736 [formerly 85b86bd6e2]]
Former-commit-id: 900c5c861e52cbb3ad86dfe63261dbbe2548e2bc [formerly cb6ed5a32c]
Former-commit-id: 2616943080
|
2014-05-06 16:01:31 -05:00 |
|
Ron Anderson
|
efac3b0017
|
Issue #3118 Fix gridLocation issues with smartInit databases
Change-Id: I4660418234a5c721381c7986b793d9339c81c603
Former-commit-id: 32a23a5d03 [formerly 93320d43c9] [formerly b4815af7f8] [formerly 32a23a5d03 [formerly 93320d43c9] [formerly b4815af7f8] [formerly ba0c26edf6 [formerly b4815af7f8 [formerly a4a5522abbb439066acfa3567d0036cf044ef9c7]]]]
Former-commit-id: ba0c26edf6
Former-commit-id: 3f137282ab [formerly 03ac05ef4c] [formerly 37fa908e6e020de500d2bf296af4b231a9fefa81 [formerly b694dbe2e1]]
Former-commit-id: 8d9e2e4725b197ff3a2ed345086c564f937403e9 [formerly 98c11671d2]
Former-commit-id: 8d44fdcfb1
|
2014-05-06 15:09:25 -05:00 |
|
Brian.Dyke
|
498d65cf2b
|
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 341e5c86c6 [formerly 5461f75e41] [formerly 238e8f7ba1] [formerly 341e5c86c6 [formerly 5461f75e41] [formerly 238e8f7ba1] [formerly e3b0b44b71 [formerly 238e8f7ba1 [formerly c6ba49e1206ed113b57a9fa39f5720ee9b3b979a]]]]
Former-commit-id: e3b0b44b71
Former-commit-id: ec78d8eaa6 [formerly 430543e848] [formerly 3127e516c70af6d10210a6ef7215b4867cdcea5c [formerly 43cc1d0b91]]
Former-commit-id: f87a93c760bf92376069fe122ffd646b7e7f003e [formerly fe9aeb1961]
Former-commit-id: 4f425f71e6
|
2014-05-06 11:34:46 -04:00 |
|
Richard Peter
|
cbae8323b0
|
Issue #3102: Fix edexBridge connection leak
Change-Id: Ic0938d31d9ff607249e980c443f98f251501b823
Former-commit-id: 1a2d875bd0 [formerly 2668f09447] [formerly 501980904d] [formerly 1a2d875bd0 [formerly 2668f09447] [formerly 501980904d] [formerly b091a8827a [formerly 501980904d [formerly 79c52892667d34abb651a36f7f5bd89f4143ffff]]]]
Former-commit-id: b091a8827a
Former-commit-id: 6eb5a21ec6 [formerly 8f1b5b647d] [formerly bc0584123479bf5fdaccff51f63a759a58593715 [formerly d03c47719f]]
Former-commit-id: 4585aeb1c1c934aa634aa78cc7373e3e0048cbf4 [formerly 87c6348e61]
Former-commit-id: e555144511
|
2014-05-06 10:32:31 -05:00 |
|
Brian.Dyke
|
a3f44717e0
|
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
Former-commit-id: c6f84d017a [formerly 0253aa5d7f] [formerly 90fecdc71e] [formerly c6f84d017a [formerly 0253aa5d7f] [formerly 90fecdc71e] [formerly 04b8da6f73 [formerly 90fecdc71e [formerly 9adc24725f9bd3499d8f498990413df7718de83e]]]]
Former-commit-id: 04b8da6f73
Former-commit-id: 78c2b4f651 [formerly 695bf96cef] [formerly 146541251c06fef81900f918bd9602e7baa95fbd [formerly 884a1d2f2b]]
Former-commit-id: d3a0335dc82bbdb40b9bc447f09fb2583a945b21 [formerly 8f6a58d5c5]
Former-commit-id: 9d60a1030a
|
2014-05-06 11:25:15 -04:00 |
|
Sathya.Sankarasubbu
|
37700e4c33
|
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: faa48d1691 [formerly 23102eaa8f] [formerly edd543c48d] [formerly faa48d1691 [formerly 23102eaa8f] [formerly edd543c48d] [formerly 1246776d3e [formerly edd543c48d [formerly cdeb7f00af695c6d0a79958af23862bd6f3c7ee5]]]]
Former-commit-id: 1246776d3e
Former-commit-id: 1455e80f01 [formerly 386091eb78] [formerly 7b40259554ba6085fa43f8748c94f70a55a15233 [formerly 1309866bb8]]
Former-commit-id: afe5b2e47bd32538c4d8a480a2703d5dd2533ab7 [formerly 6268f58f94]
Former-commit-id: 47bb8dfc50
|
2014-05-05 14:33:20 -04:00 |
|