Commit graph

206 commits

Author SHA1 Message Date
Nate Jensen
96214e9554 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: 15405cab1b [formerly 15405cab1b [formerly 0f66e6b3e5999f5f1f97b74b157838c598110cb2]]
Former-commit-id: 63b2fe798a
Former-commit-id: 3be446fca8
2013-08-13 12:27:02 -05:00
Lee Venable
a0e0b81a81 Merge "Issue #2243 Prevented invalid follow ups." into omaha_13.5.1
Former-commit-id: 69dd7b66fa [formerly 69dd7b66fa [formerly db71f51d18af219c2fdee6dcbe077be50d4e9e54]]
Former-commit-id: 69645f03dc
Former-commit-id: d9e82e20fd
2013-08-08 16:40:59 -05:00
Jonathan Sanchez
9be546dab8 Issue #2243 Prevented invalid follow ups.
Change-Id: I45f756cd5d7d41cd0086cc76b5473d37ed5b0c1e

Former-commit-id: 4711226b21 [formerly 4711226b21 [formerly a09e3b7957bdfeebb4283fad2ce5cce5d26b8a26]]
Former-commit-id: dad0681ae0
Former-commit-id: d068b5d61f
2013-08-08 16:31:35 -05:00
Greg Armendariz
172bc300ca 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: b08ce25ac8 [formerly b08ce25ac8 [formerly d79f0ffacc775ed4dc49bcf35adacf4fded994d3]]
Former-commit-id: ffb2bea8ad
Former-commit-id: 566532c40d
2013-08-08 16:24:39 -05:00
Greg Armendariz
b66fcc40a5 13.5.1-13 baseline
Former-commit-id: 29b823fee4 [formerly 29b823fee4 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]
Former-commit-id: 5577e686c1
Former-commit-id: 8bfac41add
2013-08-08 17:00:36 -04:00
Greg Armendariz
cbf9e42c21 13.5.1-12 baseline
Former-commit-id: c9898ba8d1 [formerly c9898ba8d1 [formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]]
Former-commit-id: fe51885ba7
Former-commit-id: 9892a1a262
2013-08-08 15:34:01 -04:00
David Gillingham
6b03403d65 Issue #1842: Fix ETN assignment for products with multiple NEW segments with the same phensig.
Change-Id: Iba28011bafdff9a01e7039ce7a439d84bf473389

Former-commit-id: 20e0f4b756 [formerly 20e0f4b756 [formerly d0e5cbfdc0ddd13a157ecd85a14af904fb52dc35]]
Former-commit-id: f839ef6f3b
Former-commit-id: 616c023369
2013-08-08 09:41:33 -05:00
Greg Armendariz
9a1b44efdc Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: ecc9f77f42 [formerly ecc9f77f42 [formerly abb16b014694113cd7f2582542fd0d0f54a2da4e]]
Former-commit-id: 6b1989cb29
Former-commit-id: c46f04dd72
2013-08-07 14:46:30 -05:00
Greg Armendariz
f06ee47260 13.5.1-11 baseline
Former-commit-id: ea7b22500e [formerly ea7b22500e [formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]]
Former-commit-id: 4ec04083bd
Former-commit-id: 26e58d8cdb
2013-08-07 14:34:27 -04:00
Greg Armendariz
f37ef8c24e 13.5.1-10 baseline
Former-commit-id: 852455843f [formerly 852455843f [formerly c2c6882c462c34ce9cb9ea3399071c2a121ba0f7]]
Former-commit-id: acf7ced37b
Former-commit-id: 05282eac88
2013-08-07 14:14:46 -04:00
Steve Harris
834819949f Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 72893066cc [formerly 72893066cc [formerly 64b7a7f6a035d5832f2338d854780b16d22306db]]
Former-commit-id: 97ef150656
Former-commit-id: b346666ef1
2013-08-01 08:27:10 -05:00
Steve Harris
e16fce85ae 13.5.1-9 baseline
Former-commit-id: 97fe6a670f [formerly 97fe6a670f [formerly 06a1dd45adedbe259f9c30ebf93f2f90017fe945]]
Former-commit-id: 6e60cd9a79
Former-commit-id: bbb7f1dd49
2013-08-01 09:20:23 -04:00
Ron Anderson
e1a78db830 Issue #2239 fixed scaling of MakeHazard maps when polygons cross the date line
Change-Id: Idd3745f141b78c74a39cf99746acb45d5f143b10

Former-commit-id: 390f5b2439 [formerly 390f5b2439 [formerly f4feae82505c29bc49113682d2cd584ec3ed6233]]
Former-commit-id: 47b977cdec
Former-commit-id: 77e8cd467f
2013-07-31 09:00:07 -05:00
Nate Jensen
91d5ab7554 Issue #2223 fix melting layer memory leak
Change-Id: I2fbf4dbaea12e4bba560b27ba372df0c3f913fec

Former-commit-id: 5e29be3d1f [formerly 5e29be3d1f [formerly 49299504331c730ffe8a94f490f88337baf12233]]
Former-commit-id: 1c765670ea
Former-commit-id: 97c71fc9dc
2013-07-26 08:43:29 -05:00
Steve Harris
1a3197efdf 13.5.1-8 baseline
Former-commit-id: 3bece5e5d0 [formerly 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 2afb46f814
2013-07-26 09:02:34 -04:00
Steve Harris
eff4fb29dd 13.5.1-7 baseline
Former-commit-id: bf58a81b38 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]
Former-commit-id: 86ce1248c2
Former-commit-id: f9c9aecba5
2013-07-18 12:07:22 -04:00
Greg Armendariz
ec2637676d 13.5.1-6 baseline
Former-commit-id: 7e09fa5a0b [formerly 7e09fa5a0b [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]
Former-commit-id: b9044b1195
Former-commit-id: 12a09f9aa7
2013-07-10 10:04:22 -04:00
Greg Armendariz
dc881f4ed8 13.5.1-5 baseline
Former-commit-id: 492f92ef7b [formerly 492f92ef7b [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]
Former-commit-id: ea7ac37930
Former-commit-id: 869922cb82
2013-07-03 12:20:27 -04:00
Steve Harris
c183e08922 13.5.1-4 baseline
Former-commit-id: 70e4ff30a6 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]
Former-commit-id: e197f23ce3
Former-commit-id: f658320357
2013-06-28 09:46:25 -04:00
Steve Harris
1e939939b5 13.5.1-3 baseline
Former-commit-id: 63803c1424 [formerly 63803c1424 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]
Former-commit-id: 72d22a30c9
Former-commit-id: 810388f00a
2013-06-24 09:29:43 -04:00
Steve Harris
332a74c4de 13.5.1-2 baseline
Former-commit-id: adb779323d [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]
Former-commit-id: 3386330894
Former-commit-id: 3926dc20f7
2013-06-17 15:01:22 -04:00
Steve Harris
146c5e8940 13.5.1-1 baseline
Former-commit-id: 998961612c [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]
Former-commit-id: fe872355a7
Former-commit-id: 30ba1d634e
2013-06-10 15:17:17 -04:00
Steve Harris
8ec7524cbb 13.4.1-14 baseline
Former-commit-id: c749e122eb [formerly c749e122eb [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]
Former-commit-id: 18b90226a2
Former-commit-id: dee685e3c7
2013-06-06 15:15:27 -04:00
Steve Harris
c9155c1631 13.4.1-13 baseline
Former-commit-id: 87b9712009 [formerly 87b9712009 [formerly f79327d3865cb0fa7812d5fba896c1a46013badf]]
Former-commit-id: de476791fb
Former-commit-id: b58cf237bf
2013-05-29 16:30:09 -04:00
Steve Harris
0d9e71aee2 13.4.1-12 baseline
Former-commit-id: 6a97b4325a [formerly 6a97b4325a [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]
Former-commit-id: e53ada66b8
Former-commit-id: bd4f93e859
2013-05-22 16:42:39 -04:00
Steve Harris
2767fd893c 13.4.1-11 baseline
Former-commit-id: 2edee36158 [formerly 2edee36158 [formerly e414ae01ab52b3940647e46e22bba3b89790c142]]
Former-commit-id: c0376ce9ed
Former-commit-id: 6df093ef48
2013-05-21 09:19:25 -04:00
Steve Harris
322036ea82 13.4.1-10 baseline
Former-commit-id: 9a403b3615 [formerly 9a403b3615 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]
Former-commit-id: 92152778b9
Former-commit-id: b1fc4e625b
2013-05-20 10:52:47 -04:00
Steve Harris
3f87ea1a15 13.4.1-9 baseline
Former-commit-id: bcf7f15c90 [formerly bcf7f15c90 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]
Former-commit-id: aff41713f9
Former-commit-id: 0766ae20dd
2013-05-16 11:12:07 -04:00
Steve Harris
395d21565f 13.4.1-8 baseline
Former-commit-id: 19866e7032 [formerly 19866e7032 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]
Former-commit-id: c59b52a266
Former-commit-id: a1c4cd2a39
2013-05-14 09:21:41 -04:00
Steve Harris
dffa6d3bdc 13.4.1-7 baseline
Former-commit-id: 4c6ff79e71 [formerly 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]
Former-commit-id: 8347bed50e
Former-commit-id: b35027f661
2013-05-13 12:58:10 -04:00
Steve Harris
2e835dc591 13.4.1-6 baseline
Former-commit-id: 8379977673 [formerly 8379977673 [formerly f30c650b1c406889c38a5f82bbeda3605adbd9a5]]
Former-commit-id: 16fe8cc5a2
Former-commit-id: 979700c302
2013-05-07 08:47:39 -04:00
Steve Harris
53daaea355 13.4.1-5 baseline
Former-commit-id: 85bbf6d242 [formerly 85bbf6d242 [formerly 2d978fe3d2cf99e04040d191e040dbcb84a60b9a]]
Former-commit-id: 4ae0e2e858
Former-commit-id: aa4624c58f
2013-05-03 09:29:14 -05:00
Steve Harris
764924cd1e 13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4)
Former-commit-id: 1a6fd7edfd [formerly 1a6fd7edfd [formerly dca18e1b350f5424ec129b6cd0d602ceb86e119b]]
Former-commit-id: 0f76c3cbee
Former-commit-id: 99a7521fd6
2013-05-03 09:20:30 -05:00
Steve Harris
e0986cfda8 13.4.1-4 baseline
Former-commit-id: d33e5861aa [formerly d33e5861aa [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]
Former-commit-id: 7a78f8ac6e
Former-commit-id: 7828293d32
2013-05-02 10:00:38 -05:00
Steve Harris
7e923539d5 13.4.1-3 baseline
Former-commit-id: 54afedf617 [formerly 54afedf617 [formerly 02412063da81fbfd3f1bbdd48700e1b1ccdeb4fd]]
Former-commit-id: 86e96f378c
Former-commit-id: 8a41dd2048
2013-04-29 12:25:07 -05:00
Steve Harris
c0481dcdf2 13.4.1-2 baseline
Former-commit-id: 52f0ae4758 [formerly 52f0ae4758 [formerly 8b85b1f1e96220b29e8c3b891f6df6a9633c3b4d]]
Former-commit-id: 5ebd58a0b3
Former-commit-id: 99bc8c8072
2013-04-24 17:22:10 -05:00
Steve Harris
4001e050e7 13.4.1-1 baseline
Former-commit-id: 2f517b7713 [formerly 2f517b7713 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]
Former-commit-id: 00332e6305
Former-commit-id: 4accbb80db
2013-04-24 17:15:55 -05:00
Steve Harris
44cd8d47fb 13.3.1-20 baseline
Former-commit-id: 25432cc388 [formerly 25432cc388 [formerly 91210030e50e7a19c3d8d4c9d377494de2bc83dd]]
Former-commit-id: 446bec6f49
Former-commit-id: 4b71131386
2013-04-15 08:58:59 -05:00
Steve Harris
7d76371536 13.3.1-19 baseline
Former-commit-id: 9be238bcc4 [formerly 9be238bcc4 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]
Former-commit-id: abaf9f12f9
Former-commit-id: 340a2cfb23
2013-04-09 08:37:12 -05:00
Steve Harris
044912d48b 13.3.1-18 baseline
Former-commit-id: a2b098d86d [formerly a2b098d86d [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]
Former-commit-id: ce6a06a7e3
Former-commit-id: bf6c3b6762
2013-04-03 14:58:29 -05:00
Steve Harris
50becef97f 13.3.1-17 baseline
Former-commit-id: 7bf9966dcb [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]
Former-commit-id: a3fe998f8f
Former-commit-id: 4afa41d4e7
2013-04-01 12:04:56 -05:00
Steve Harris
c53a305b1e 13.3.1-16 baseline
Former-commit-id: 51380726d4 [formerly 51380726d4 [formerly 18321f88c2efedf141b84e7de18c200e1037f740]]
Former-commit-id: 3066dd33e5
Former-commit-id: 36a4b3eb51
2013-04-01 11:39:08 -05:00
Steve Harris
4204273f21 13.3.1-15 baseline
Former-commit-id: eb1dab3864 [formerly eb1dab3864 [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]
Former-commit-id: 3d8ed484be
Former-commit-id: d3cec5d3cb
2013-04-01 11:33:20 -05:00
Steve Harris
8237fdadaa 13.3.1-14 baseline
Former-commit-id: 9022c500ce [formerly 9022c500ce [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]
Former-commit-id: 9fba973fd0
Former-commit-id: 2ca160caf0
2013-03-27 17:59:34 -05:00
Steve Harris
7aa4f7b265 13.3.1-13 baseline
Former-commit-id: c77a452f5a [formerly c77a452f5a [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]
Former-commit-id: c65f3e68e5
Former-commit-id: 822d05a709
2013-03-26 12:43:07 -05:00
Steve Harris
f1d156779a 13.3.1-12 baseline
Former-commit-id: 0be473728a [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: aaac0b51e5
Former-commit-id: bc439aee4f
2013-03-25 13:27:13 -05:00
Steve Harris
f2cc967a4f 13.3.1-10 baseline
Former-commit-id: 073687d9a9 [formerly 073687d9a9 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]
Former-commit-id: 7078eec1b1
Former-commit-id: 7c2e617d26
2013-03-20 15:53:01 -05:00
Steve Harris
65f522fc87 13.3.1-9 baseline
Former-commit-id: 468ae82305 [formerly 468ae82305 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 0375805e79
2013-03-19 14:22:56 -05:00
Steve Harris
0c94cc97fb 13.3.1-8 baseline
Former-commit-id: f97d78994b [formerly f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]
Former-commit-id: c15b3ffe20
Former-commit-id: 5f492500ea
2013-03-18 15:43:32 -05:00
Steve Harris
3084a860cd 13.3.1-7 baseline
Former-commit-id: a72254cc75 [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]
Former-commit-id: e12ed113ae
Former-commit-id: 31c0a97dca
2013-03-13 09:50:28 -05:00