Brian.Dyke
|
6aaec52bb2
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: c532d924ee [formerly d5177787c6 ] [formerly c532d924ee [formerly d5177787c6 ] [formerly 54808cc027 [formerly 6c54705000e153a9c17465631149a26aaf5f8c67]]]
Former-commit-id: 54808cc027
Former-commit-id: b58885d191 [formerly 0cacdb9fc0 ]
Former-commit-id: d3cd0ca28a
|
2014-08-08 11:31:24 -04:00 |
|
Roger Ferrel
|
eaab491a42
|
Issue #3507 Merge fixes for Archive Case Creation.
Former-commit-id: c4655dbe88 [formerly d7b2355016 ] [formerly c4655dbe88 [formerly d7b2355016 ] [formerly 4f946d4921 [formerly 2263bd75920d4fbaf2bfc3445e4b320291401c16]]]
Former-commit-id: 4f946d4921
Former-commit-id: 5e5d95c8a1 [formerly 4891c9f540 ]
Former-commit-id: ec03ef31b6
|
2014-08-07 14:17:24 -05:00 |
|
Baoyu Yin
|
eb518d0a48
|
VLab Issue #4370 - AWIPS2_DR_16154 and AWIPS2_DR_17212; closes #4370
Change-Id: If5ae492896f702b1857a1abcd13df5f517015704
Former-commit-id: f731a2050e [formerly 8228a5d2ce ] [formerly f731a2050e [formerly 8228a5d2ce ] [formerly 00156b84ae [formerly 1795f54a4a9ccdade1f8e3a1c4bfb04c859c24f5]]]
Former-commit-id: 00156b84ae
Former-commit-id: 7c84536372 [formerly 4c4eb13c03 ]
Former-commit-id: 2f3637ed1f
|
2014-08-07 09:39:24 -04:00 |
|
Stephen Gilbert
|
121ce70919
|
VLab Issue #4079 - Add Magnetometer timeseries plot support from NCP
Change-Id: Ibd9f495908cbd0db40368207ddc1bea2ea09bdeb
Former-commit-id: 025f1d9436 [formerly 188a5f41da ] [formerly 025f1d9436 [formerly 188a5f41da ] [formerly 04e7a9e515 [formerly b99088dbb902db49f7eb7df720b5c2bdaa68bb3f]]]
Former-commit-id: 04e7a9e515
Former-commit-id: 71b9932026 [formerly e06cbc844c ]
Former-commit-id: a37c463cae
|
2014-08-05 16:29:21 -04:00 |
|
Roger Ferrel
|
d38e6abd16
|
Omaha #3171 Change Archive Retention labels.
Change-Id: I42cbf2aae820c75564bba7dfbd4d7b2589b9e085
(cherry picked from commit 68b1dd7bca81df01df646d2b455383105e70b5bc [formerly 825e2c1b19 ] [formerly eebc5096b2 [formerly 44a23b4500 ] [formerly eebc5096b2 [formerly 44a23b4500 ] [formerly 825e2c1b19 [formerly 1249deb91b6463044a59ca564e26f82612f52d40]]]])
Former-commit-id: 5a014c90ec [formerly f79496d029 ] [formerly 5a014c90ec [formerly f79496d029 ] [formerly ef2e4d0c2f [formerly e2be5e04fff2e0f2c4cd25ed94c0daae07933455]]]
Former-commit-id: ef2e4d0c2f
Former-commit-id: 039a20efed [formerly 6894c12589 ]
Former-commit-id: fc2398dbab
|
2014-08-05 08:49:24 -05:00 |
|
Roger Ferrel
|
67810f6a2d
|
Issue #3045 Change column label to "Data Set".
Change-Id: I4088fb29fd942ecc07c82e3da24d9561cb3b1b13
(cherry picked from commit 0b67be0d6ce4f75d97b1900c21edd34a69db88d4 [formerly cf6d1c8ca1 ] [formerly 8eb4c91ab3 [formerly 3a2a6afaf1 ] [formerly 8eb4c91ab3 [formerly 3a2a6afaf1 ] [formerly cf6d1c8ca1 [formerly f00ce42d8e79ef47d9b14125dc61129fc60fc0cf]]]])
Former-commit-id: 0d458f4e3e [formerly f29852d5bc ] [formerly 0d458f4e3e [formerly f29852d5bc ] [formerly 994adc2ad5 [formerly c1537561419604b05ec17c0aa01f272b3d4ed9f3]]]
Former-commit-id: 994adc2ad5
Former-commit-id: 3d50e30c4a [formerly 339ab4258a ]
Former-commit-id: 90033b53ee
|
2014-08-05 08:46:08 -05:00 |
|
Roger Ferrel
|
c535700eb4
|
Issue #3045 - Change to prevent race conditions while getting table labels.
Change-Id: I82d0ab9deaa2b2b89a859fcb76af5d5cd7692120
(cherry picked from commit a9df5defd6b8d72f5be9175f4a877ce89f7c3194 [formerly 2a0a9b5334 ] [formerly e2b03eb190 [formerly 9dad4c959b ] [formerly e2b03eb190 [formerly 9dad4c959b ] [formerly 2a0a9b5334 [formerly 17a06743e41fe6bf15a895d9842bb51d99901602]]]])
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
Former-commit-id: 0400202ab6 [formerly 7e6a90c895 ] [formerly 0400202ab6 [formerly 7e6a90c895 ] [formerly b17b511e40 [formerly 47a22d226ed36c07443d540bf800cbb2fc3e2a15]]]
Former-commit-id: b17b511e40
Former-commit-id: 903e80dcba [formerly d8427d3d2b ]
Former-commit-id: 55d49db34c
|
2014-08-05 08:45:33 -05:00 |
|
Roger Ferrel
|
97579e24da
|
Issue #3023 Configurable available disk thresholds and unit test fixes
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0
(cherry picked from commit 034fd9ddf208942f5ef84e2c4383a0512874e8b9 [formerly 3af564a653 ] [formerly dc25ece75f [formerly 8ce590c31c ] [formerly dc25ece75f [formerly 8ce590c31c ] [formerly 3af564a653 [formerly ce00327d4cd248efb65fd8b6e823d93c81c9a902]]]])
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
Former-commit-id: a394ec6b59 [formerly 8171a30330 ] [formerly a394ec6b59 [formerly 8171a30330 ] [formerly 0a09094ac0 [formerly 14922cb75f4f37b0edfa930bf575eba7e3d55806]]]
Former-commit-id: 0a09094ac0
Former-commit-id: 971a29b8c1 [formerly cb1b8bba84 ]
Former-commit-id: 7dfeadf032
|
2014-08-05 08:43:23 -05:00 |
|
Lee Venable
|
28423d7071
|
Issue #3034 - added widget dispose checks in runAsync methods.
Change-Id: I9182441c34c63c5a78023adda2ec036f2a51192e
(cherry picked from commit 5400c9bc5f35ed3547b5d51cae3d0cf0f0829b51 [formerly ff3b42468f ] [formerly f4fb7b24f6 [formerly 7f068f164c ] [formerly f4fb7b24f6 [formerly 7f068f164c ] [formerly ff3b42468f [formerly 8e8e65ecbc22dcebb7a494ddbd6b7183d67981a0]]]])
Former-commit-id: 10249c98f1 [formerly 5a5bab45ae ] [formerly 10249c98f1 [formerly 5a5bab45ae ] [formerly 05a17c05a8 [formerly 553877dba98909270e492e090290b66bdb2fcc55]]]
Former-commit-id: 05a17c05a8
Former-commit-id: 38131e5b90 [formerly 1e2816e4ec ]
Former-commit-id: 75ed3bcf24
|
2014-08-05 08:39:55 -05:00 |
|
Roger Ferrel
|
04360e9889
|
Issue #2862 Implements locks on case creation.
Change-Id: Ic0975b699e54b30f152422782e11ac04c310cb1b
(cherry picked from commit 41c889ce01087a1848a114aa936c54e0767e65ad [formerly cfea0489d7 ] [formerly 16fab01b8b [formerly 5570261d74 ] [formerly 16fab01b8b [formerly 5570261d74 ] [formerly cfea0489d7 [formerly b10c78a4f3cb7abb265d8c383c6bc2912d166720]]]])
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
Former-commit-id: f079a85cf2 [formerly 0e2dca458c ] [formerly f079a85cf2 [formerly 0e2dca458c ] [formerly a0e8aa94d8 [formerly e03e26e2e155df1cf9193fc6ecbd36b9c0bd9df5]]]
Former-commit-id: a0e8aa94d8
Former-commit-id: 2288276976 [formerly 7185b58ef3 ]
Former-commit-id: 36a1b87087
|
2014-08-05 08:39:07 -05:00 |
|
Roger Ferrel
|
88dc997abc
|
Issue #2879 Code clean up.
(cherry picked from commit e64acb0dec268edbcae84573f02958ed926e27a1 [formerly f6fe26d3de ] [formerly 4a306121bd [formerly dd09032119 ] [formerly 4a306121bd [formerly dd09032119 ] [formerly f6fe26d3de [formerly 6fbb95beec25582f577dc3547f8f3424eb92cdf2]]]])
Former-commit-id: 455984c02f [formerly 2fdae6c508 ] [formerly 455984c02f [formerly 2fdae6c508 ] [formerly 8cbcbf7e12 [formerly adc6d643b12d8d934f56ed0d342dba521a4ad4d1]]]
Former-commit-id: 8cbcbf7e12
Former-commit-id: fe189104d8 [formerly c8e6b7507e ]
Former-commit-id: 5612bd507f
|
2014-08-05 08:27:28 -05:00 |
|
Roger Ferrel
|
3c313363b6
|
Issue #2879 Loading case no longer changes start/end time.
(cherry picked from commit 37a1065de7ea675e61cb7a6b47bf239acfc74da5 [formerly b78a05658d ] [formerly 6e2d462052 [formerly 2f9c62bd0c ] [formerly 6e2d462052 [formerly 2f9c62bd0c ] [formerly b78a05658d [formerly 60275732b2abcecf671a8338c8f87334baad3702]]]])
Former-commit-id: ef7271abe9 [formerly a9890b8f31 ] [formerly ef7271abe9 [formerly a9890b8f31 ] [formerly 2d20ab20d7 [formerly 022b3d53f874392b50ce81b87d179f853e180201]]]
Former-commit-id: 2d20ab20d7
Former-commit-id: 93dab5f3bb [formerly 6c4d7058b6 ]
Former-commit-id: 13dd333011
|
2014-08-05 08:27:13 -05:00 |
|
Brian Clements
|
2efb84cffd
|
Issue #2594 added low memory warning job
UiPlugin starts and stops job
job notifies perspective manager of low memory
Viz perspective manager has default alert implementation
D2D and GFE override alert message
added memory threshold property to product files
(cherry picked from commit 6f9888233712999528448bb5ea30ffb73d5f11f7 [formerly 0076ec9aaf ] [formerly c63c8e2fc6 [formerly f9a8b68da5 ] [formerly c63c8e2fc6 [formerly f9a8b68da5 ] [formerly 0076ec9aaf [formerly 4af42d405d3bf24b00c027f5dab8faf500a9e5b7]]]])
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
cave/com.raytheon.viz.product.awips/awips.product
Former-commit-id: 1cd4dc7d4a [formerly 5a3c66323a ] [formerly 1cd4dc7d4a [formerly 5a3c66323a ] [formerly 6859f8cca8 [formerly 7fb934f4782d23f1772ba32db05ed0c1c30ff6db]]]
Former-commit-id: 6859f8cca8
Former-commit-id: 1fb42d88bd [formerly a717c43054 ]
Former-commit-id: 9f42a5d411
|
2014-08-05 08:21:27 -05:00 |
|
Brian Clements
|
f58af6cb29
|
Issue #2594 made heap status monitor default on launch
(cherry picked from commit 8c4df6a7f1fa65b6971c8962149a08e208f846a2 [formerly 4a62eb90dc ] [formerly 4f37164fc5 [formerly 6ba1eb0edb ] [formerly 4f37164fc5 [formerly 6ba1eb0edb ] [formerly 4a62eb90dc [formerly 1ba7ebb59e28ba93bb752c32ffce937a4455d478]]]])
Former-commit-id: 163a4eedef [formerly d7c68e0f42 ] [formerly 163a4eedef [formerly d7c68e0f42 ] [formerly a415d870e5 [formerly c61cc2c3bf49dbdcd00c82d5731c12b9e635ac1b]]]
Former-commit-id: a415d870e5
Former-commit-id: 21a0739235 [formerly 95db4b6477 ]
Former-commit-id: e8e0224faa
|
2014-08-05 08:12:14 -05:00 |
|
Brian.Dyke
|
4be2bcf64a
|
Merge branch 'master_14.3.1' into asm_14.3.1
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
Former-commit-id: 8ea5c4f98b [formerly 6f6daaa249 ] [formerly 8ea5c4f98b [formerly 6f6daaa249 ] [formerly 7fbb3b6a54 [formerly f22cc09d0a6fdc7a806726d5207f6b3507972b94]]]
Former-commit-id: 7fbb3b6a54
Former-commit-id: 3e56f7e403 [formerly 45cfe1aa9c ]
Former-commit-id: 861a40ce5a
|
2014-08-04 16:40:02 -04:00 |
|
Brian.Dyke
|
803ceadaec
|
Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.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
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 301f3094be [formerly 9abb02ea8a ] [formerly 301f3094be [formerly 9abb02ea8a ] [formerly 270d2b0ddb [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]]
Former-commit-id: 270d2b0ddb
Former-commit-id: bbe6ec4d50 [formerly 37aacfcb96 ]
Former-commit-id: b9daa26f7d
|
2014-08-04 13:10:13 -04:00 |
|
Brian Clements
|
7f921c7c3d
|
Issue #3488 added sanity check for bin range in lightning viz resource
Change-Id: I23ec1614821dcbc18c06f58e3ef00371988fc30a
Former-commit-id: dfc3545bf5 [formerly 7b312ab6a7 ] [formerly dfc3545bf5 [formerly 7b312ab6a7 ] [formerly 30ca12aae7 [formerly 701b56ec37053654e64cfd6ea831aad4ea7b9d8a]]]
Former-commit-id: 30ca12aae7
Former-commit-id: dd00eeb0ab [formerly 140bf429b9 ]
Former-commit-id: 6961892b9d
|
2014-08-04 11:22:12 -05:00 |
|
Juliya Dynina
|
d20ab7db34
|
Merge "ASM #15665 - Improve SatResource.java logging" into asm_14.2.2
Former-commit-id: 08c503140e [formerly 072104e2d7 ] [formerly 08c503140e [formerly 072104e2d7 ] [formerly 9e2124dd23 [formerly 98b85b738d099d8e2cc811aace8d6e6d913e45e9]]]
Former-commit-id: 9e2124dd23
Former-commit-id: 95ea71c3d8 [formerly 00cbc0892c ]
Former-commit-id: d1c8c7cae2
|
2014-07-31 13:59:38 -05:00 |
|
Melissa Porricel
|
c3dabfacb0
|
ASM #15665 - Improve SatResource.java logging
Change-Id: Ibd0b246c36fe5547378a0a92793361ecc659cb1d
Former-commit-id: 8ac4827751 [formerly e31865ae4f ] [formerly 8ac4827751 [formerly e31865ae4f ] [formerly b59c3ee811 [formerly 5e369a7626987fbad409d25b7bcf3820c6268592]]]
Former-commit-id: b59c3ee811
Former-commit-id: 6fa5575f14 [formerly 7b4255bf2f ]
Former-commit-id: faaf0c206c
|
2014-07-31 11:36:49 -04:00 |
|
Brian.Dyke
|
29bc56c37f
|
Merge branch 'asm_14.2.2' into master_14.2.2
Former-commit-id: eeca2f2ec8 [formerly 3598f7b549 ] [formerly eeca2f2ec8 [formerly 3598f7b549 ] [formerly 905728d2fb [formerly 96ff2234e0d8893695b33a79d24a026a1a409073]]]
Former-commit-id: 905728d2fb
Former-commit-id: 370b180653 [formerly e3745633a3 ]
Former-commit-id: f5030dfeb5
|
2014-07-31 09:56:21 -04:00 |
|
Shawn.Hooper
|
53daf4e3bc
|
ASM #15627 Revert "ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products."
This reverts commit 9732ea69398c323fee2b61570bfc18ab595da709 [formerly 8cffe955a9 ] [formerly e24dd6958e [formerly ba4c386f30 ] [formerly e24dd6958e [formerly ba4c386f30 ] [formerly 8cffe955a9 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]]]].
Change-Id: Ie01ca9463a4db371ffce0b6e38d5c43e1f9addf2
Former-commit-id: 27f50397aa [formerly 976c7b2d4a ] [formerly 27f50397aa [formerly 976c7b2d4a ] [formerly 4e322737ce [formerly d272d426f8bd218954a75a7b2e19d21b30f975cb]]]
Former-commit-id: 4e322737ce
Former-commit-id: af19d9f9c4 [formerly fe0fffe51b ]
Former-commit-id: 17ac974932
|
2014-07-30 14:03:51 -04:00 |
|
Juliya Dynina
|
e044393934
|
Merge "ASM #15648 Change to Cities.xml" into asm_14.2.2
Former-commit-id: 92e7f244fc [formerly fc27de56d2 ] [formerly 92e7f244fc [formerly fc27de56d2 ] [formerly 37587144c0 [formerly 264920b8af1b2665b17c1015afe02e6f4a719419]]]
Former-commit-id: 37587144c0
Former-commit-id: 984ca28f1b [formerly 6cf910a1e7 ]
Former-commit-id: 4d19f304ed
|
2014-07-30 07:48:43 -05:00 |
|
Daniel.Huffman
|
11de63b4f0
|
ASM #15648 Change to Cities.xml
Change-Id: Idc89484cf45fcd1fb30538119d254ed9c0fd79e2
Former-commit-id: 008255ad0e [formerly aca63e248f ] [formerly 008255ad0e [formerly aca63e248f ] [formerly ea11c48008 [formerly 1e2b8582fa4dec428b70a2e8aaa1e401ddbfcee7]]]
Former-commit-id: ea11c48008
Former-commit-id: cf2df78596 [formerly e9986b7316 ]
Former-commit-id: e9f98275bd
|
2014-07-29 21:41:00 +00:00 |
|
Brian.Dyke
|
27c5823961
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 69b2041dfd [formerly c8a7361ec6 ] [formerly 69b2041dfd [formerly c8a7361ec6 ] [formerly a8b601ee85 [formerly 2e0b11b6afbcda488399920642dced37545c7541]]]
Former-commit-id: a8b601ee85
Former-commit-id: c1e200e11d [formerly 88fd42e9dd ]
Former-commit-id: 979dd02b0a
|
2014-07-29 16:00:59 -04:00 |
|
Michael Gamazaychikov
|
cc3172ead3
|
ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products.
Change-Id: Ic5689db7714be086d6e4543602db33a07e5b2fc1
Former-commit-id: e24dd6958e [formerly ba4c386f30 ] [formerly e24dd6958e [formerly ba4c386f30 ] [formerly 8cffe955a9 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]]]
Former-commit-id: 8cffe955a9
Former-commit-id: f186b49e92 [formerly bb7b43be49 ]
Former-commit-id: 134b1286fc
|
2014-07-28 15:12:10 -04:00 |
|
Qinglu.Lin
|
000daa2716
|
ASM #15554 - Improve speed/efficiency of WarngenLayer.populateStrings
Change-Id: I6a3b9823ac7c23ba171206708187ab3fc3c7c1ca
Former-commit-id: f69a06238b [formerly 1eca5ef51a ] [formerly f69a06238b [formerly 1eca5ef51a ] [formerly 2aa16c114a [formerly 3b971d52a82099142fe08986df879a379dfa6314]]]
Former-commit-id: 2aa16c114a
Former-commit-id: 28842008ec [formerly 80c41d8904 ]
Former-commit-id: b3b4c058aa
|
2014-07-28 12:36:07 -04:00 |
|
Ron Anderson
|
e9b0d50ee9
|
Issue #3423 Move alarm/alert product requests off UI thread
Change-Id: I44149b5af54fbeac75231d6caeb3929fbf6ecf5e
Former-commit-id: ac0799ce35 [formerly 17b681f355 ] [formerly ac0799ce35 [formerly 17b681f355 ] [formerly 174d8b59e0 [formerly c3401cee78edae8dea6d21736fac25bfed996fb3]]]
Former-commit-id: 174d8b59e0
Former-commit-id: 3da914cf97 [formerly 64ba8b1c1a ]
Former-commit-id: 243decf322
|
2014-07-24 14:02:10 -05:00 |
|
Zhidong.Hao
|
2a4ea1243c
|
ASM #15645 - Fix for AvnFPS: TAF syntax check fails when equal sign is missing
Change-Id: I1a4fb9be1253b4655bd43674aab4a4ddcf6d0ce7
Former-commit-id: d7cce22d02 [formerly 26c4bb2414 ] [formerly d7cce22d02 [formerly 26c4bb2414 ] [formerly a3cda853cf [formerly 192948e00538bcf0dfc0aaf20ea1dcb216313ffb]]]
Former-commit-id: a3cda853cf
Former-commit-id: ee2f893d21 [formerly eef5191d1c ]
Former-commit-id: 350028e069
|
2014-07-23 14:37:28 -04:00 |
|
Steve Harris
|
a980faab73
|
Merge branch 'master_14.2.2' (14.2.2-21) into omaha_14.2.2
Former-commit-id: 619ed933ac [formerly eaa4456fa7 ] [formerly 619ed933ac [formerly eaa4456fa7 ] [formerly 35130cb3f5 [formerly 2c17b02a196584edbaa2cef33d8e9adc91567f8e]]]
Former-commit-id: 35130cb3f5
Former-commit-id: ab6fad008f [formerly 0da15f729e ]
Former-commit-id: 9b3af6a2dd
|
2014-07-23 13:07:11 -05:00 |
|
Jonathan Sanchez
|
e4268f814e
|
Issue #3419 Refactored watches to use the county table.
Change-Id: Ide7e07813203213511640d5ee515e73b278089c1
Former-commit-id: 997485dd22 [formerly 86a8ca4a30 ] [formerly 997485dd22 [formerly 86a8ca4a30 ] [formerly b991838494 [formerly 135d7ffa84af58d7b3c9575e654fa1298b76b2e2]]]
Former-commit-id: b991838494
Former-commit-id: f7bc9a8023 [formerly 025c29acc0 ]
Former-commit-id: 56cbd23141
|
2014-07-22 15:32:12 -05:00 |
|
Steve Harris
|
3b5fc91579
|
Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: 7b0b043c67 [formerly bce7039508 ] [formerly 7b0b043c67 [formerly bce7039508 ] [formerly 8a7ea92c2b [formerly c0033681d38af55bff79efbceec119606fcc5c2f]]]
Former-commit-id: 8a7ea92c2b
Former-commit-id: 7a4111b29f [formerly 0314663e95 ]
Former-commit-id: e24b5a2fec
|
2014-07-22 10:26:33 -05:00 |
|
Ana Rivera
|
462749040d
|
VLab Issue #4154 - DR_14068, DCS_53 Add 3 RTMA parms, add AK RTMA 3km; closes #4154
Change-Id: If6af5c54b31911a954295ce4ae60c9d9449d4b55
Former-commit-id: 9670521c07 [formerly c10b50d0b2 ] [formerly 9670521c07 [formerly c10b50d0b2 ] [formerly 088ebd2ca2 [formerly 9c3460d34513dd2f54643b87cb8afd122d94ea9c]]]
Former-commit-id: 088ebd2ca2
Former-commit-id: 5a764dff66 [formerly 752bc11851 ]
Former-commit-id: 0eb194e2bb
|
2014-07-21 21:41:17 +00:00 |
|
Brian.Dyke
|
b77d938e42
|
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 9ef7783251 [formerly e55b892fc3 ] [formerly 9ef7783251 [formerly e55b892fc3 ] [formerly c26e0cd548 [formerly 499b825592fdbdf150c918e5f3abacc4f37ddd70]]]
Former-commit-id: c26e0cd548
Former-commit-id: efff77a72c [formerly a3618e103e ]
Former-commit-id: 3e66c55f09
|
2014-07-21 11:18:25 -04:00 |
|
David Friedman
|
4bdc4d4297
|
ASM #15049 - LAPS time matching problem
Change-Id: I52eee87defb407b741208e183b9829558bfa6733
Former-commit-id: 6aebd3a19b [formerly ec25c44fe7 ] [formerly 6aebd3a19b [formerly ec25c44fe7 ] [formerly 188e25d2e7 [formerly 624c3a4225910863d5cc0b795493a39c0422a3e3]]]
Former-commit-id: 188e25d2e7
Former-commit-id: e73a125fd9 [formerly 93a57dafea ]
Former-commit-id: 9efbcdf0b2
|
2014-07-18 17:06:05 +00:00 |
|
Nate Jensen
|
18439faeb9
|
Issue #2954 actually log when the scalesInfo.xml cannot be parsed before
falling back to the base version
Change-Id: I2df669504061160c6ace76560f07845f99a80912
Former-commit-id: 82bef00378 [formerly da731be2f7 ] [formerly 82bef00378 [formerly da731be2f7 ] [formerly 2a01b1ebcd [formerly 894e6ac1db5b34e6466c68aefa5877b9405bfd59]]]
Former-commit-id: 2a01b1ebcd
Former-commit-id: ecff8cddf2 [formerly 95731087ed ]
Former-commit-id: eec604da0d
|
2014-07-17 13:27:48 -05:00 |
|
Nate Jensen
|
a559ae9796
|
Issue #2954 fall back to existing map scales if map scale is missing
Change-Id: I75083325edec689c38f2fe7661c635ddf3e0f527
Former-commit-id: c07802a208 [formerly 6e21526fd2 ] [formerly c07802a208 [formerly 6e21526fd2 ] [formerly ed9bee5533 [formerly c7167ad2f59ba02edc842f321d12cd36cd6da8bb]]]
Former-commit-id: ed9bee5533
Former-commit-id: 12aa82ee3f [formerly d07ec00b92 ]
Former-commit-id: 61b8abe589
|
2014-07-15 18:27:09 -05:00 |
|
steve.naples
|
db04c1a2ec
|
ASM #253 Update RadarBiasTableDialog fix issue of not saving undo.
Change-Id: I57ad9d4407665fd4c5f7e922cbf3daac373c9f88
Former-commit-id: 2ebfd61f12 [formerly 339fcbc18a ] [formerly 2ebfd61f12 [formerly 339fcbc18a ] [formerly 0bd7b6c65b [formerly 24b9a6e0801cc653062a71d86090df3836aa86a4]]]
Former-commit-id: 0bd7b6c65b
Former-commit-id: 6b58fb2509 [formerly aa8c11d134 ]
Former-commit-id: 458dd1fe8f
|
2014-07-09 15:42:51 +00:00 |
|
Ron Anderson
|
a1a980ed6e
|
Issue #3332 Fixed race condition which could cause GFE grid saving to hang
Change-Id: I4a2ef9e25999d95ac1ecf204907c59b2f1e85652
Former-commit-id: 4b4629a2fd [formerly 111b04296c ] [formerly 4b4629a2fd [formerly 111b04296c ] [formerly 5efba03474 [formerly b01b72b896b894568acce6a8dc4d45328a06067a]]]
Former-commit-id: 5efba03474
Former-commit-id: e39615ab7a [formerly 1cc0ff4ab7 ]
Former-commit-id: 0a7c4c855e
|
2014-07-09 08:56:06 -05:00 |
|
Stephen Gilbert
|
6f919a7222
|
VLab Issue #4003 - NCEP CAVE Plugins delivery for 14.2.1-n
Changes needed for awips.swcm to produce a clean build
Change-Id: I42f4bff9b23620fc6b35769f3693f8db72e9124e
Former-commit-id: fc47f0b4c7 [formerly 09e8d0c448 ] [formerly fc47f0b4c7 [formerly 09e8d0c448 ] [formerly f318552dae [formerly bc7c086b9c3c3fcb3c7f68506f694a924db18f00]]]
Former-commit-id: f318552dae
Former-commit-id: 80add01ad0 [formerly 805c363590 ]
Former-commit-id: 63d5407031
|
2014-07-08 16:29:33 -04:00 |
|
steve.naples
|
10e2eaa6ed
|
ASM #253 Update RadarBiasTableDialog fix issue of not saving.
Change-Id: If88c12673afeb3ae8cecfb53d856bc90820a4673
Former-commit-id: 29ca2338b8 [formerly 75969ceec2 ] [formerly 29ca2338b8 [formerly 75969ceec2 ] [formerly 24b0d49a5b [formerly 9021eca6b32dd2b3859cd928c14a0e40a4907c13]]]
Former-commit-id: 24b0d49a5b
Former-commit-id: 94e246b619 [formerly ea071e81f5 ]
Former-commit-id: 23ff3f3fe7
|
2014-07-08 16:32:08 +00:00 |
|
Brian.Dyke
|
f14f792377
|
Merge branch 'asm_14.2.2' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.2
Former-commit-id: a33fdeb558 [formerly 2ef4767652 ] [formerly a33fdeb558 [formerly 2ef4767652 ] [formerly 89c0457b1d [formerly 845aebda9d8af143e3a6828c066b291e0343a020]]]
Former-commit-id: 89c0457b1d
Former-commit-id: 6be18f0dd4 [formerly a2dc10847c ]
Former-commit-id: e9e9abd3db
|
2014-07-07 13:33:35 -04:00 |
|
David Friedman
|
c44e9f88f6
|
ASM #15052 - WarnGen: service backup should use config.xml from failed site
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1
Former-commit-id: 8784501bba [formerly a45fe1dad0 ] [formerly 8784501bba [formerly a45fe1dad0 ] [formerly db8977e281 [formerly f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20]]]
Former-commit-id: db8977e281
Former-commit-id: 5270711c5d [formerly d36834080e ]
Former-commit-id: 4f53bbd556
|
2014-07-03 13:58:24 +00:00 |
|
Juliya Dynina
|
d3073a02a7
|
Merge "ASM #253 Update RadarBiasTableDialog to remove old code." into asm_14.2.2
Former-commit-id: 67580e73cd [formerly 244b2f5f3a ] [formerly 67580e73cd [formerly 244b2f5f3a ] [formerly 470d50b4e4 [formerly d6ae0d12f104de38b8fa770e4576b96a32da360c]]]
Former-commit-id: 470d50b4e4
Former-commit-id: d705c8c8a4 [formerly b1cec7d40e ]
Former-commit-id: 3f043077b3
|
2014-07-02 14:17:11 -05:00 |
|
Steve Harris
|
a19a11998f
|
Merge branch 'master_14.2.2' (14.2.2-17,18) into omaha_14.2.2
Former-commit-id: 9b7f820b06 [formerly 136af3f7e2 ] [formerly 9b7f820b06 [formerly 136af3f7e2 ] [formerly 0ef8a057f9 [formerly c88d3136dbadab41df5fbf37b4b7c821dfcd07d9]]]
Former-commit-id: 0ef8a057f9
Former-commit-id: cb8192cfaf [formerly 9f61f60f65 ]
Former-commit-id: a12a736737
|
2014-07-02 13:38:08 -05:00 |
|
steve.naples
|
9f52699bd2
|
ASM #253 Update RadarBiasTableDialog to remove old code.
Change-Id: I003f8dbf520e1e8025afe46266d1ee4849003a6f
Former-commit-id: 3d75da3db0 [formerly 66c3241bc4 ] [formerly 3d75da3db0 [formerly 66c3241bc4 ] [formerly 4e959af1b4 [formerly b9f868e0ced53987accf675bfe2ce1a1f4f34da1]]]
Former-commit-id: 4e959af1b4
Former-commit-id: f1c92f1e35 [formerly 3cfabd29bc ]
Former-commit-id: 93c8f822cc
|
2014-07-02 15:30:48 +00:00 |
|
Nate Jensen
|
b54a9694ee
|
Issue #3337 disable logback packaging data in cave
Former-commit-id: 56363ffc4a [formerly c003d70168 ] [formerly 56363ffc4a [formerly c003d70168 ] [formerly 939fde1575 [formerly db10ba5a37dbe219110f4f902bf9257f2f220b3d]]]
Former-commit-id: 939fde1575
Former-commit-id: c421e2de75 [formerly a2cfcd8716 ]
Former-commit-id: 75ffabbcc2
|
2014-07-02 09:24:15 -05:00 |
|
Steve Harris
|
15267970e4
|
Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
Former-commit-id: f68e051938 [formerly 1c8dc56d49 ] [formerly f68e051938 [formerly 1c8dc56d49 ] [formerly 30cdbff7f8 [formerly 382c772c196711d230395f34a04559c188880622]]]
Former-commit-id: 30cdbff7f8
Former-commit-id: a4d91c59d6 [formerly 6f9129ac78 ]
Former-commit-id: d600ed9acf
|
2014-07-01 13:38:18 -05:00 |
|
Brian.Dyke
|
52977a745e
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: da6b0f2adf [formerly b64d38be69 ] [formerly da6b0f2adf [formerly b64d38be69 ] [formerly 6d93f8f3ef [formerly 765d6440b1b19d7b0cf789fb7a873e14b4a679e1]]]
Former-commit-id: 6d93f8f3ef
Former-commit-id: 685b53d6bc [formerly 55fa980898 ]
Former-commit-id: d62782613b
|
2014-07-01 13:47:12 -04:00 |
|
Steve Harris
|
8fb747ad27
|
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: 2f2958df37 [formerly d4dc1723c1 ] [formerly 2f2958df37 [formerly d4dc1723c1 ] [formerly 7acd9ab2dd [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: 7fb4663d75 [formerly dcbab5621f ]
Former-commit-id: 71357da9d2
|
2014-07-01 11:08:46 -04:00 |
|
Juliya Dynina
|
5a9181fcc1
|
Merge "ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina" into asm_14.2.2
Former-commit-id: bf765525b7 [formerly b5e4bc1fdc ] [formerly bf765525b7 [formerly b5e4bc1fdc ] [formerly 102da2d0f7 [formerly 714dbccbd26a1b6fafa486b2ddbce98d7f38c8eb]]]
Former-commit-id: 102da2d0f7
Former-commit-id: b4d23902a7 [formerly 7ed2a8cbd4 ]
Former-commit-id: 8f3581340b
|
2014-07-01 10:05:57 -05:00 |
|