Ron Anderson
|
df882296d7
|
Issue #2287 Fix yet another NullPointer in GFEColorBarResource
Change-Id: I96ff6cdff49d444f4cb90fb219531901c19460ae
Former-commit-id: d39bc76457 [formerly 5835b2d4fd] [formerly 37d94d921b] [formerly 2e24094983 [formerly 37d94d921b [formerly dabdce1482cc80b794e8f82ac55d6867a43f0c89]]]
Former-commit-id: 2e24094983
Former-commit-id: 19665b9fc7b0dbb722187cdffb87c4753d092bd8 [formerly dc1323010c]
Former-commit-id: a1a58c2d35
|
2013-08-29 17:38:01 -05:00 |
|
Ron Anderson
|
c889da84c7
|
Issue #2287 Fix null pointer in GFEColorBarResource
Change-Id: I477a7d5cc58e61b9d521337a94801114cecde62a
Former-commit-id: 48e53df2c2 [formerly 59c8dc4fae] [formerly 4e768e812d] [formerly 8f8e041802 [formerly 4e768e812d [formerly add48ba3bbf77e6e7cbfa756e6da75c78aab6f0f]]]
Former-commit-id: 8f8e041802
Former-commit-id: 7cfb29e315c4749c5fdc19a78dffa13be4b7c9d8 [formerly 316ba03c10]
Former-commit-id: 4cbdeefa33
|
2013-08-29 16:53:55 -05:00 |
|
Ron Anderson
|
39cdff917f
|
Merge "Issue #2287 Fixed fitToDataColorTable for Single Grids" into omaha_13.5.2
Former-commit-id: 1c7890b692 [formerly 6a42802aba] [formerly 9427060d683e9cfe78cba02f47d34f999f62e721 [formerly ef10d1aa13]] [formerly 183d3944e4 [formerly ef10d1aa13 [formerly 72e14b106419a137075642c77a051fa82ddb91e1]]]
Former-commit-id: 183d3944e4
Former-commit-id: 2c7505d26edbe6b08be792f686a4bde5c6656966 [formerly e366726d06]
Former-commit-id: 8b688aa10f
|
2013-08-29 14:25:45 -05:00 |
|
Steve Harris
|
b800b32b9e
|
Merge branch 'master_13.5.2' (13.5.2-2) into omaha_13.5.2
Conflicts:
msi/VizLauncher/VizLauncher.suo
msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
msi/build/A2Staging/VisualStudio/VizLauncher.exe
Former-commit-id: b6df6f2aaa [formerly 4a0604f28c] [formerly 866885e3eb] [formerly 347d1eaef4 [formerly 866885e3eb [formerly c3a0913f289df802c65015686f877ca9c5e42bf5]]]
Former-commit-id: 347d1eaef4
Former-commit-id: 3fd03f9ee6b9805b2ebcb1741513edfb88c0e02f [formerly 9a6a2561fc]
Former-commit-id: 539b51afc9
|
2013-08-29 14:19:17 -05:00 |
|
Steve Harris
|
c10c39b5d6
|
13.5.2-2 baseline
Former-commit-id: 8dcd159377 [formerly 8cde3b2b54] [formerly 4a47fb97c5] [formerly 9e4bf0cf2e [formerly 4a47fb97c5 [formerly 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9]]]
Former-commit-id: 9e4bf0cf2e
Former-commit-id: 8411cf39c13b7f63f746f4a1b8806ba15bfa7510 [formerly 5de6d566f0]
Former-commit-id: 12b0ab91fd
|
2013-08-29 15:01:29 -04:00 |
|
Ron Anderson
|
a960a14616
|
Issue #2287 Fixed fitToDataColorTable for Single Grids
Change-Id: I00325b40af3803bd0cfed601371904e5e24c1abe
Former-commit-id: c43f9b53b7 [formerly 344db44bc7] [formerly 37795f1407] [formerly 0b6ec808f2 [formerly 37795f1407 [formerly 1cffae67f0150e1a2b1509e560383aa506e4284f]]]
Former-commit-id: 0b6ec808f2
Former-commit-id: a550664bb651dd6a73d71cff9bda58ab55f5fb48 [formerly 561d4cce0b]
Former-commit-id: 078a619cf8
|
2013-08-29 13:36:04 -05:00 |
|
Max Schenkelberg
|
279e1c5919
|
Issue #2300 Fixed NPE in TileSetRenderable with ConcurrentHashMap
Change-Id: I9d92e330c66364b2eb904d5858eb6d8a4a75a542
Former-commit-id: 6528df1ebd [formerly 02cc4abf19] [formerly dc6ed0a61e] [formerly 6eedb5e26d [formerly dc6ed0a61e [formerly 34f9fdb02b82dd27d8f266bcd78291ebd9586bb5]]]
Former-commit-id: 6eedb5e26d
Former-commit-id: 3a285880333b23d324c21d685304b5e10b43400d [formerly 7175092cb9]
Former-commit-id: d1d134697d
|
2013-08-28 14:03:13 -05:00 |
|
Ron Anderson
|
b336ad1bad
|
Merge "Issue #2302 Fixed simultaneous save issue. Cleaned up AutoSave." into omaha_13.5.2
Former-commit-id: 4d4077eac0 [formerly de2507a851] [formerly 89c1f24ff8] [formerly a78ebffdb5 [formerly 89c1f24ff8 [formerly 475d289ae5a3a024d5f52f7a2c8263533ada6e3f]]]
Former-commit-id: a78ebffdb5
Former-commit-id: 032444fcc52a3ceb8c31137e43347e52644dcf76 [formerly a7a4f9d60e]
Former-commit-id: 0264f3dee8
|
2013-08-28 11:18:34 -05:00 |
|
Steve Harris
|
4ef41d2c35
|
Merge branch 'master_13.5.2' (13.5.2-1) into omaha_13.5.2
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: eb43afb042 [formerly 34e085ff97] [formerly 0791be2b77] [formerly cfe2ba88ad [formerly 0791be2b77 [formerly 5e0080743ae12b96d828451014a16ea118e25ce0]]]
Former-commit-id: cfe2ba88ad
Former-commit-id: 727a02ca1cf8ee5783dc8270301e0e9ffbdc71dc [formerly 116daf48ff]
Former-commit-id: 5abb143d01
|
2013-08-28 09:03:09 -05:00 |
|
Steve Harris
|
b4e006162f
|
13.5.2-1 baseline
Former-commit-id: 3cd0b2dfc6 [formerly 894d2425b2] [formerly 73dd0f166c] [formerly 542b2c3d18 [formerly 73dd0f166c [formerly a362ca91ee5972a1501a2842191fbe2e23feac9c]]]
Former-commit-id: 542b2c3d18
Former-commit-id: 43ff166b6d3df833e29603f504019d7b3776a1d1 [formerly 4ecb349ed8]
Former-commit-id: 43af1b227a
|
2013-08-28 09:43:48 -04:00 |
|
Ron Anderson
|
a5ed604867
|
Issue #2302 Fixed simultaneous save issue. Cleaned up AutoSave.
Change-Id: I3d9b8b2441a0b79d393ab4591450b084d24dafc3
Former-commit-id: 559e27a75f [formerly 66032fcfd7] [formerly f75dc91293] [formerly ab4c1ebe5d [formerly f75dc91293 [formerly 29e2ea5d61af71a366d3a81908b16b4c6a6850f6]]]
Former-commit-id: ab4c1ebe5d
Former-commit-id: 2ba0e690bd1e8ad733aed2a649ff316d58215905 [formerly 2670db83fd]
Former-commit-id: 877f9b9bc3
|
2013-08-27 18:54:14 -05:00 |
|
Ron Anderson
|
8e26902f09
|
Issue #2287 Fix scaling and direction of wind/swell arrows in GFE
Change-Id: Id12823256fc3c383005098b83e72249284a36f33
Former-commit-id: 04def1379d [formerly df357588a0] [formerly 77db16933e] [formerly 803515f4ff [formerly 77db16933e [formerly b0c88cb7d71cf3e081596cd47d88d8412c2ea3d1]]]
Former-commit-id: 803515f4ff
Former-commit-id: 5764de917b8e19b33bed0061d37a440fbc638101 [formerly 518e32206e]
Former-commit-id: a1952b7c75
|
2013-08-27 13:51:17 -05:00 |
|
Lee Venable
|
894dbe333c
|
Issue #2283 - cleaned up some synchronizrd code.
Former-commit-id: 6c390e5ffd [formerly b8f94691c1] [formerly 027dae1e9b] [formerly ea4df9cb2d [formerly 027dae1e9b [formerly f162222be931d03c3a0401205869d48854703c36]]]
Former-commit-id: ea4df9cb2d
Former-commit-id: febc79faa2ce62e69731f24e1957e231711e9664 [formerly d3268de97a]
Former-commit-id: b03ec5a6fe
|
2013-08-26 09:41:21 -05:00 |
|
Steve Harris
|
edd03a1cf1
|
Merge branch 'master_13.5.2' (13.5.1-18) into omaha_13.5.2
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
nativeLib/edexBridge/edexBridge.cpp
Former-commit-id: abb7bdd7ed [formerly decc9e4c36] [formerly e361386eab] [formerly 119af8a466 [formerly e361386eab [formerly a3671ea2935178a28dce6d075dc2067a609e6725]]]
Former-commit-id: 119af8a466
Former-commit-id: 4e6f59fd5b911fc5753e9e8c4824360e1ab43c50 [formerly 5b11d137df]
Former-commit-id: f56b906997
|
2013-08-23 11:36:43 -05:00 |
|
Jonathan Sanchez
|
1fefefe9d8
|
Issue #2176 Implemented emergency warning products.
Cherry picked from 13.6.1 e6bb79e45c989e4292b8485307ae239e491cb630 [formerly 67ce90c14a] [formerly 46d5bd4f0a [formerly c62de0d75f] [formerly 7d74ba5ee1] [formerly 67ce90c14a [formerly 7d74ba5ee1 [formerly 36df6339cc00afc5935746a4a47b0e9e8c641f85]]]] to 13.5.2
Change-Id: I80623a63abd495baf3e0004625732f26453a30d9
Former-commit-id: 4ff3193e89 [formerly 051cdc28c2] [formerly e0bd81c0ae] [formerly cf51ba9e9c [formerly e0bd81c0ae [formerly be486757ed36916c1c3a1e56ddf98754b900b693]]]
Former-commit-id: cf51ba9e9c
Former-commit-id: 1288c49579d7228f01cfd602e4cd73832a09bc32 [formerly 051c8103c7]
Former-commit-id: c9026b5709
|
2013-08-22 12:25:42 -05:00 |
|
Lee Venable
|
6ef5a7c3f2
|
Merge "Issue #2177 Improve county portion descriptions." into omaha_13.5.2
Former-commit-id: fadc0d374c [formerly a0437634dc] [formerly 07f087013f] [formerly 321ddebdde [formerly 07f087013f [formerly 1b7f1d8dce2cc1161ce06ca0c4a8df68803a12e1]]]
Former-commit-id: 321ddebdde
Former-commit-id: 1825a07f92bc280ec091a8ccab5f7014fa0d7773 [formerly 0af2308491]
Former-commit-id: f5f1525809
|
2013-08-22 11:53:18 -05:00 |
|
Jonathan Sanchez
|
ee0f46321b
|
Issue #2177 Improve county portion descriptions.
Change-Id: I9b2326e0b57b2bba7223032e3f08846f0d2f121d
Former-commit-id: 833a869e69 [formerly 67602003cd] [formerly 0c06112925] [formerly 321799e07b [formerly 0c06112925 [formerly a8e74ba813cc841c6cc6ff06df73080d1ce1fd8c]]]
Former-commit-id: 321799e07b
Former-commit-id: 09f6083745f373a9f45f183c6c6d17c10d6388bb [formerly edbc238355]
Former-commit-id: e1663e7f8d
|
2013-08-22 10:49:09 -05:00 |
|
Steve Harris
|
ff31991527
|
13.5.1-18 baseline
Former-commit-id: 80d8236464 [formerly d931b80e70] [formerly afb34814dd] [formerly 0a7acf96c7 [formerly afb34814dd [formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]]]
Former-commit-id: 0a7acf96c7
Former-commit-id: bef853d6001eb232a3c91986195c4ab5e86bc9cd [formerly 2f9aa87a9f]
Former-commit-id: 261b1da9d6
|
2013-08-22 09:12:43 -04:00 |
|
Bryan Kowal
|
c350450024
|
Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now
- Note: VizLauncher and AWIPSII.CAVE are NOT Eclipse projects.
Former-commit-id: 3e9c78b9e0 [formerly 013ba62af1] [formerly a1fccaa598] [formerly 21cfeb1b83 [formerly a1fccaa598 [formerly c1c6cd087a493f052a66fbc6e7b608cd959f7905]]]
Former-commit-id: 21cfeb1b83
Former-commit-id: 28e6522f39684a2c80f4e36f7968404f94210af4 [formerly 6cf776926c]
Former-commit-id: eec811c3b1
|
2013-08-20 13:56:07 -05:00 |
|
Steve Harris
|
4fd4093539
|
13.5.1-17 baseline
Former-commit-id: fb9ab08255 [formerly 2d882ccb54] [formerly 9dd7dc5d20] [formerly b210c90245 [formerly 9dd7dc5d20 [formerly c5d75a6473b2659b9ac1054a1160c921bd8c1c16]]]
Former-commit-id: b210c90245
Former-commit-id: c4d2af6f3a1f86a3300795dc1db7d6c9323eac0b [formerly a192a3ebb1]
Former-commit-id: 7c0cf13ea8
|
2013-08-19 16:34:24 -04:00 |
|
Max Schenkelberg
|
39cdbf728f
|
Issue #2255 Made TransformFactory loop to find true base crs in worldToCRS and worldToGrid.
Change-Id: I0cbb4ce0446ab4080ee0dc0f87c1de2ffc77a5a7
Former-commit-id: 54b4b759fd [formerly 5a4d880498] [formerly e85d66f4e5] [formerly 3800aec9e6 [formerly e85d66f4e5 [formerly d132d2ec2fc296518765d78b04ed942ec246b2e0]]]
Former-commit-id: 3800aec9e6
Former-commit-id: ac74cfea7295b7cc3576674f8b131a9d316f9718 [formerly d89d13d029]
Former-commit-id: 352e21ffd3
|
2013-08-15 15:50:40 -05:00 |
|
Max Schenkelberg
|
43fc7e0b43
|
Issue #2189 Added a FontType option when initializing a font from a file.
Change-Id: I54973b7c380b1535dd1e1f7fb49fd0b74b3d1752
Amend: Added abstract awt font class, deprecated initializeFont not specifying FontType, added comments
Former-commit-id: 59f3945002 [formerly b07ed474e3] [formerly eab65aab5a] [formerly 570266eb7b [formerly eab65aab5a [formerly 473421a32f7c53453db1c5331714204a89bad4da]]]
Former-commit-id: 570266eb7b
Former-commit-id: 3b2d7d1617ff2d360cb22f44c042b38c9fe3c5e3 [formerly 5840d99a95]
Former-commit-id: 72fbe0208e
|
2013-08-15 13:51:07 -05:00 |
|
Steve Harris
|
27a5acb143
|
Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 8f0b0c1514 [formerly 08b105a492] [formerly 727eba03b9] [formerly a687da6075 [formerly 727eba03b9 [formerly 85cde5da231741012e611250a5c3490467aeef1b]]]
Former-commit-id: a687da6075
Former-commit-id: d74946ee629b4883a0e073d9f37dae4d8ca4ed97 [formerly 522867f068]
Former-commit-id: e5c50ad0b6
|
2013-08-15 12:46:48 -05:00 |
|
Steve Harris
|
ca5796e082
|
13.5.1-16 baseline
Former-commit-id: 47130c98a5 [formerly 6818d80085] [formerly 34ed84336297f15bcf09076786d608ada5df2472 [formerly cd3b63d961]] [formerly 7ce0234d76 [formerly cd3b63d961 [formerly 2fcbcde58066c18ab423c94c37f446ab5e7f42da]]]
Former-commit-id: 7ce0234d76
Former-commit-id: 0cee24c9ec1cc1b51da8edf9a2cdeef3b66498e1 [formerly d7b1ed4900]
Former-commit-id: e881ff6271
|
2013-08-15 13:40:37 -04:00 |
|
Jonathan Sanchez
|
93efe34bc1
|
Issue #2243 Resolved timing issues.
Change-Id: Ia0386bf21087cb2a00175e35ecfeae5206797a34
Former-commit-id: 6902b263e5 [formerly 78b655fd1f] [formerly 2b849d7003] [formerly bc30396b63 [formerly 2b849d7003 [formerly 5833ecad04c31502b4e2991853e6aabeda4919f2]]]
Former-commit-id: bc30396b63
Former-commit-id: 702fb2f390774821e3e6340fc29892363db3d33d [formerly fca67fb4ca]
Former-commit-id: 19853a4b57
|
2013-08-15 10:56:37 -05:00 |
|
Richard Peter
|
309c524817
|
Issue #1977: Fix merge issue with WarngenDialog
Former-commit-id: 4dc2cdd1d4 [formerly 8ba6abf642] [formerly 7c03fc955b] [formerly a5383dbfa4 [formerly 7c03fc955b [formerly ddfc06eb9753e893ece28e1718c5e4550e82b053]]]
Former-commit-id: a5383dbfa4
Former-commit-id: adf78ace14b85f663608aeb404baf77669836088 [formerly 951bb37cd7]
Former-commit-id: c8ad0e3317
|
2013-08-14 15:33:02 -05:00 |
|
Richard Peter
|
28a53c8a33
|
Merge branch 'master_13.5.1' (13.5.1-15) into omaha_13.5.1
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/FollowUpUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
Former-commit-id: 9ff9054d7e [formerly 2608dfe1d8] [formerly c61afa1bfa] [formerly ee6b9eb11a [formerly c61afa1bfa [formerly 87a1f8f44cbdfb9006eb5e222ae2c220c6a324b3]]]
Former-commit-id: ee6b9eb11a
Former-commit-id: 4ccbd370354ae0debc8270aa65a8ac1c72bc2ba9 [formerly 58a4aaa080]
Former-commit-id: 3f65eaf74b
|
2013-08-14 14:29:55 -05:00 |
|
Steve Harris
|
6f1b6d494f
|
13.5.1-15 baseline
Former-commit-id: b05abcaec0 [formerly 535218c676] [formerly 53e96e21db] [formerly c6dc1817e7 [formerly 53e96e21db [formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]]
Former-commit-id: c6dc1817e7
Former-commit-id: c5d936eabd4d2eeade071aad734eb9b268940a49 [formerly 65beefde58]
Former-commit-id: 4f9288e7c1
|
2013-08-14 10:24:26 -04:00 |
|
Steve Harris
|
4e75333155
|
13.5.1-14 baseline
Former-commit-id: c6465a3398 [formerly b848317203] [formerly d695e5debe] [formerly 80e5f7fbd4 [formerly d695e5debe [formerly fe7b1a704ee92b34684e4f9059bd61cfa28dd485]]]
Former-commit-id: 80e5f7fbd4
Former-commit-id: 979d519294a0cce041889e9000a739088fbe1b71 [formerly cd5b1e9e2f]
Former-commit-id: 9bd983e2fe
|
2013-08-14 10:07:41 -04:00 |
|
Jonathan Sanchez
|
aafcbe9520
|
Issue #2243 Resolved incorrect import.
Change-Id: I02e446858d36a934b9aa308a0bc2d4df3863defb
Former-commit-id: 714982e96f [formerly 52d7862d36] [formerly c6b6576f01] [formerly fd0f2f1c09 [formerly c6b6576f01 [formerly f79e7820ea010e0bc860b0033183147d7299221f]]]
Former-commit-id: fd0f2f1c09
Former-commit-id: ea268f1966644425a392151655f4081fa9cf6ad5 [formerly 70bb266da7]
Former-commit-id: 7189057682
|
2013-08-13 20:47:49 -05:00 |
|
Richard Peter
|
0c915ec5dc
|
Merge "Issue #2243 Fixed update list bugs." into omaha_13.5.1
Former-commit-id: 4dd1b27e44 [formerly 2b23cb871e] [formerly 6efc27c1b1] [formerly d5130432a8 [formerly 6efc27c1b1 [formerly d7d87eb785c9c5e26a841503ea11fac4461b23b3]]]
Former-commit-id: d5130432a8
Former-commit-id: 2a26f47bc2eef0af172637a67f611d6028ddb875 [formerly 2fc754b899]
Former-commit-id: e28de494e9
|
2013-08-13 16:45:37 -05:00 |
|
Jonathan Sanchez
|
3806121231
|
Issue #2243 Fixed update list bugs.
Change-Id: Ie04d66593c450592c78fccdb8d6b78d889d4b68f
Former-commit-id: dc2363ffd7 [formerly 8d0ee7f5ca] [formerly d685125b25] [formerly 49f488a58f [formerly d685125b25 [formerly 4dcfd87f1ae127b8050a4c168a5acf0dd6c815ee]]]
Former-commit-id: 49f488a58f
Former-commit-id: dd476c502c979c6b882524dd8959a4110265b20f [formerly 96c88ad28b]
Former-commit-id: d33332bd58
|
2013-08-13 16:30:05 -05:00 |
|
Nate Jensen
|
e63e7120e5
|
Issue #2197 cherry picking 2197 into 13.5
Change-Id: Ic4c5447a39923252b73930ac1577bf63258ae56f
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResourceData.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
Former-commit-id: 9a01271f5f [formerly a9815b0551] [formerly 15405cab1b] [formerly 63b2fe798a [formerly 15405cab1b [formerly 0f66e6b3e5999f5f1f97b74b157838c598110cb2]]]
Former-commit-id: 63b2fe798a
Former-commit-id: 63f208510706ceb9b97414afeb3057e182119b34 [formerly 3be446fca8]
Former-commit-id: 464a104dc1
|
2013-08-13 12:27:02 -05:00 |
|
Lee Venable
|
b46745eebb
|
Merge "Issue #2243 Prevented invalid follow ups." into omaha_13.5.1
Former-commit-id: c314bf2092 [formerly ef5a7fb83a] [formerly 69dd7b66fa] [formerly 69645f03dc [formerly 69dd7b66fa [formerly db71f51d18af219c2fdee6dcbe077be50d4e9e54]]]
Former-commit-id: 69645f03dc
Former-commit-id: e115b93102485b11368b55772e8726745f744ad8 [formerly d9e82e20fd]
Former-commit-id: 696ee07b3f
|
2013-08-08 16:40:59 -05:00 |
|
Jonathan Sanchez
|
1e64c5d491
|
Issue #2243 Prevented invalid follow ups.
Change-Id: I45f756cd5d7d41cd0086cc76b5473d37ed5b0c1e
Former-commit-id: 7d34154d2c [formerly 05f49219d3] [formerly 4711226b21] [formerly dad0681ae0 [formerly 4711226b21 [formerly a09e3b7957bdfeebb4283fad2ce5cce5d26b8a26]]]
Former-commit-id: dad0681ae0
Former-commit-id: 47e2f4c744287d8c0b4a9cc10d78ee81fa61534a [formerly d068b5d61f]
Former-commit-id: b467d0fd66
|
2013-08-08 16:31:35 -05:00 |
|
Greg Armendariz
|
d4840d3802
|
Merge branch 'master_13.5.1' into omaha_13.5.1
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
Former-commit-id: 154539a4fe [formerly 3cecb178cf] [formerly b08ce25ac8] [formerly ffb2bea8ad [formerly b08ce25ac8 [formerly d79f0ffacc775ed4dc49bcf35adacf4fded994d3]]]
Former-commit-id: ffb2bea8ad
Former-commit-id: 86468f816c52e90d514c87d790110decf28213ac [formerly 566532c40d]
Former-commit-id: 24dc722be4
|
2013-08-08 16:24:39 -05:00 |
|
Greg Armendariz
|
076a0b08ac
|
13.5.1-13 baseline
Former-commit-id: 429898edc6 [formerly f0b62a22bf] [formerly 29b823fee4] [formerly 5577e686c1 [formerly 29b823fee4 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]]
Former-commit-id: 5577e686c1
Former-commit-id: 12247e45609042e5a8e46278311d4b5b7ec9eb9d [formerly 8bfac41add]
Former-commit-id: 9f2f62427b
|
2013-08-08 17:00:36 -04:00 |
|
Greg Armendariz
|
75d1e77f1b
|
13.5.1-12 baseline
Former-commit-id: 34e0218b59 [formerly 01d067cff9] [formerly c9898ba8d1] [formerly fe51885ba7 [formerly c9898ba8d1 [formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]]]
Former-commit-id: fe51885ba7
Former-commit-id: cdf25117bf69e350e12772219b241d184999c14d [formerly 9892a1a262]
Former-commit-id: f777a744e5
|
2013-08-08 15:34:01 -04:00 |
|
David Gillingham
|
3ec31afc5d
|
Issue #1842: Fix ETN assignment for products with multiple NEW segments with the same phensig.
Change-Id: Iba28011bafdff9a01e7039ce7a439d84bf473389
Former-commit-id: ec00fa0cf8 [formerly 6471edab78] [formerly 20e0f4b756] [formerly f839ef6f3b [formerly 20e0f4b756 [formerly d0e5cbfdc0ddd13a157ecd85a14af904fb52dc35]]]
Former-commit-id: f839ef6f3b
Former-commit-id: d665f9bc6ae29833ae4f277da48202baec858dd5 [formerly 616c023369]
Former-commit-id: 5f9352cb65
|
2013-08-08 09:41:33 -05:00 |
|
Greg Armendariz
|
65b70ce223
|
Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 7398504d85 [formerly d1fb06feb7] [formerly ecc9f77f42] [formerly 6b1989cb29 [formerly ecc9f77f42 [formerly abb16b014694113cd7f2582542fd0d0f54a2da4e]]]
Former-commit-id: 6b1989cb29
Former-commit-id: 515c934b42be211ce5f92cab2acdd2eb519d3d9f [formerly c46f04dd72]
Former-commit-id: fc6195bbf6
|
2013-08-07 14:46:30 -05:00 |
|
Greg Armendariz
|
4c20fc4977
|
13.5.1-11 baseline
Former-commit-id: 814f7fdcdd [formerly c402dbf6e9] [formerly ea7b22500e] [formerly 4ec04083bd [formerly ea7b22500e [formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]]]
Former-commit-id: 4ec04083bd
Former-commit-id: f2fc00d3a51154c96e69230aaba5d4ce07cccb09 [formerly 26e58d8cdb]
Former-commit-id: 75f9f8df3f
|
2013-08-07 14:34:27 -04:00 |
|
Greg Armendariz
|
690ea2e228
|
13.5.1-10 baseline
Former-commit-id: 9694f9390a [formerly e276b0fabe] [formerly 852455843f] [formerly acf7ced37b [formerly 852455843f [formerly c2c6882c462c34ce9cb9ea3399071c2a121ba0f7]]]
Former-commit-id: acf7ced37b
Former-commit-id: 55e2845c864335ebeda69be5a21e4f9deaffd22e [formerly 05282eac88]
Former-commit-id: 9ddb32967c
|
2013-08-07 14:14:46 -04:00 |
|
Steve Harris
|
e680a0e630
|
Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 3573599aaf [formerly 1917c598bc] [formerly 72893066cc] [formerly 97ef150656 [formerly 72893066cc [formerly 64b7a7f6a035d5832f2338d854780b16d22306db]]]
Former-commit-id: 97ef150656
Former-commit-id: 2b8530d5516361d757800e54b2cc11d91e3b78b4 [formerly b346666ef1]
Former-commit-id: 6ec0c65e84
|
2013-08-01 08:27:10 -05:00 |
|
Steve Harris
|
7fc384a659
|
13.5.1-9 baseline
Former-commit-id: 1be9abc02f [formerly 778df21de9] [formerly 97fe6a670f] [formerly 6e60cd9a79 [formerly 97fe6a670f [formerly 06a1dd45adedbe259f9c30ebf93f2f90017fe945]]]
Former-commit-id: 6e60cd9a79
Former-commit-id: 1facde304923c944b67d09bf0537810759f82aa7 [formerly bbb7f1dd49]
Former-commit-id: c7e7c838aa
|
2013-08-01 09:20:23 -04:00 |
|
Ron Anderson
|
d09f5d9d0b
|
Issue #2239 fixed scaling of MakeHazard maps when polygons cross the date line
Change-Id: Idd3745f141b78c74a39cf99746acb45d5f143b10
Former-commit-id: c0dc7d2e46 [formerly 4c61168660] [formerly 390f5b2439] [formerly 47b977cdec [formerly 390f5b2439 [formerly f4feae82505c29bc49113682d2cd584ec3ed6233]]]
Former-commit-id: 47b977cdec
Former-commit-id: 114c4a17a51aff6ca84968879bde76a89a25803b [formerly 77e8cd467f]
Former-commit-id: 17fef5a2ab
|
2013-07-31 09:00:07 -05:00 |
|
Nate Jensen
|
e60e5dba08
|
Issue #2223 fix melting layer memory leak
Change-Id: I2fbf4dbaea12e4bba560b27ba372df0c3f913fec
Former-commit-id: 68fbcf5bb2 [formerly 7fc047102b] [formerly 5e29be3d1f] [formerly 1c765670ea [formerly 5e29be3d1f [formerly 49299504331c730ffe8a94f490f88337baf12233]]]
Former-commit-id: 1c765670ea
Former-commit-id: 293b692d6b0250e935d8663ee184a7d26bdf62fd [formerly 97c71fc9dc]
Former-commit-id: 5cc5818af7
|
2013-07-26 08:43:29 -05:00 |
|
Steve Harris
|
340e7bab60
|
13.5.1-8 baseline
Former-commit-id: 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 045a10d1b22e942768c319f31dc18646c3419092 [formerly 2afb46f814]
Former-commit-id: a7d4c6274e
|
2013-07-26 09:02:34 -04:00 |
|
Steve Harris
|
0fe8173b7b
|
13.5.1-7 baseline
Former-commit-id: 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 86ce1248c2 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]
Former-commit-id: 86ce1248c2
Former-commit-id: 5aea78fbd5da8a55b6f4dc4542505312f878d73d [formerly f9c9aecba5]
Former-commit-id: cb50a0028d
|
2013-07-18 12:07:22 -04:00 |
|
Greg Armendariz
|
f23d42e977
|
13.5.1-6 baseline
Former-commit-id: e375a74bc8 [formerly 5894853996] [formerly 7e09fa5a0b] [formerly b9044b1195 [formerly 7e09fa5a0b [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]
Former-commit-id: b9044b1195
Former-commit-id: 760e0f04ffe2e9d265f85e7c8b4777777bcf64d5 [formerly 12a09f9aa7]
Former-commit-id: 93b71934c0
|
2013-07-10 10:04:22 -04:00 |
|
Greg Armendariz
|
d5bea0fc06
|
13.5.1-5 baseline
Former-commit-id: ed9da994c7 [formerly 82aabf1066] [formerly 492f92ef7b] [formerly ea7ac37930 [formerly 492f92ef7b [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]
Former-commit-id: ea7ac37930
Former-commit-id: 95bf0ef285bd2b4a9686028c226e04cf2a86cfe7 [formerly 869922cb82]
Former-commit-id: d899faec3d
|
2013-07-03 12:20:27 -04:00 |
|