Commit graph

3435 commits

Author SHA1 Message Date
Ben Steffensmeier
644b43649a Issue #2260 Switch poessounding to NSharp.
Change-Id: Ib1d067727ab6db11c20de308dce34d6752e79e78

Former-commit-id: 63604dad27 [formerly fb23de355e] [formerly 36a920333f] [formerly 74b0b57f4b [formerly 36a920333f [formerly 4e83b721a46cea5af56fd2444ba4bf22813604e9]]]
Former-commit-id: 74b0b57f4b
Former-commit-id: 2dc426002f0ac501f60be71e2c0a10436e7cf8c8 [formerly 94e79ff7b4]
Former-commit-id: ad82565d1a
2013-08-15 17:51:52 -05:00
Ben Steffensmeier
7811f7c18b Issue #2258 Convert profiler sounding to var height with hodo.
Change-Id: I7b8c704ebc847169c2d09bb0bea13d0b60a9cff6

Former-commit-id: e401fe335f [formerly b7b18e02bf] [formerly 0c2f894b82] [formerly 32a0b19a38 [formerly 0c2f894b82 [formerly 2aab48d1032c0b6fd14645437836ad5ca13cb415]]]
Former-commit-id: 32a0b19a38
Former-commit-id: b2f2e9a8c3c371425dac6b0fe4ec8f9a52e935af [formerly f75824d4bc]
Former-commit-id: 890eaa3751
2013-08-15 16:15:15 -05:00
David Gillingham
be64302011 Issue #2262: Fix ImportError and misnamed method in meteolib.py.
Change-Id: Ic6eb7de7b8c5b6ff7fbd989a43d00c97ea688364

Former-commit-id: d43d6506fa [formerly a8868c5beb] [formerly 8ef34db798] [formerly 953fc192a1 [formerly 8ef34db798 [formerly b61065e473c5f783ebe3cfd603a9e7bd91b63a11]]]
Former-commit-id: 953fc192a1
Former-commit-id: 502cb37326055c452bc1b35e8e9edab2d5e952b0 [formerly a4ed28a384]
Former-commit-id: afbb147ef6
2013-08-15 13:14:39 -05:00
Steve Harris
aba7f09b15 Merge branch 'omaha_13.5.1' (13.5.1-16) into development
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
	nativeLib/edex_com/.cproject

Former-commit-id: 56416708fc [formerly 3f8cc1daf3] [formerly 8484f03bb8] [formerly 891f00d650 [formerly 8484f03bb8 [formerly e8580e78f408b796a1fea65167c43cc122a325bf]]]
Former-commit-id: 891f00d650
Former-commit-id: 39e71fd5cc358e2f7e3567f0928d250b71241a87 [formerly 44251fd949]
Former-commit-id: 2681f1f045
2013-08-15 12:50:08 -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
Ben Steffensmeier
15a295ca05 Issue #2259 fix units for goes point data pressure
Former-commit-id: 91df4581d2 [formerly d3628766b8] [formerly 2171c10e9e] [formerly 984c5f2684 [formerly 2171c10e9e [formerly 411c30dc9a5396ade5af03294cad612472e8060b]]]
Former-commit-id: 984c5f2684
Former-commit-id: 430e4cc00c7532c4d09b1b5178c1c9a413e1a952 [formerly fff0ce30ae]
Former-commit-id: 7070a2bd18
2013-08-15 12:02:24 -05:00
David Gillingham
218ec39696 Issue #2262: Port hgt2pres, ztopsa, ptozsa, calcrh from meteolib into
Java. Convert to use of these new methods where possible. Create unit tests.

Change-Id: Ib21dc7e92eb7324dba79d128d785ced58aaeae2d

Former-commit-id: bd9b224ff5 [formerly c17f8b4409] [formerly 0b6b0e06cc] [formerly 40b5d54bf3 [formerly 0b6b0e06cc [formerly 5992197809236553e9c021526e42d28ed327b413]]]
Former-commit-id: 40b5d54bf3
Former-commit-id: 677ad3a406560b6ea868401e4fe7be87a4817e25 [formerly 8d347252d2]
Former-commit-id: 9c656c28b9
2013-08-15 11:30:45 -05: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
Ron Anderson
afcfafb027 Merge "Issue #1133 Better error handling for invalid polygons in map resource. Change-Id: Ib935f3c4fee42dae21eb52adf19ea9e2e9d76442" into development
Former-commit-id: d70ba1184d [formerly 5afcf8bee2] [formerly 2b491f11ad] [formerly ca560e5fc0 [formerly 2b491f11ad [formerly 9f4d6e687d0dae6dd9104fd39c44144c0d7ce174]]]
Former-commit-id: ca560e5fc0
Former-commit-id: 721ef25321b96666b7f8c0e38c59a7d3b652d02c [formerly 86b10cfd4b]
Former-commit-id: 7924115bbc
2013-08-15 10:50:57 -05:00
Ben Steffensmeier
6b5e7b465b Issue #1133 Better error handling for invalid polygons in map resource.
Change-Id: Ib935f3c4fee42dae21eb52adf19ea9e2e9d76442

Former-commit-id: b887dcbe6d [formerly aa08c8af42] [formerly 27594e6808] [formerly 7f9bbf3d52 [formerly 27594e6808 [formerly 68f1b06c79639874b94b87e4f4365f1fe36c7bac]]]
Former-commit-id: 7f9bbf3d52
Former-commit-id: 2620f59e4670bcb1f4adcdc1ccc3ccf9e49ea0f2 [formerly 5b51795a18]
Former-commit-id: b970d2ffbb
2013-08-15 10:32:28 -05:00
Richard Peter
24f8756c64 Issue #2214: Fix merge issue with gfe-spring.xml
Former-commit-id: e5cb3f9e0a [formerly 2064be203d] [formerly eb8805e51c] [formerly dad1b6fb45 [formerly eb8805e51c [formerly 346de47492d79ea1a2605fa3a02bc5058f2b8e9e]]]
Former-commit-id: dad1b6fb45
Former-commit-id: cb3e15e4ac897a4a2e865c445de30e1e35aa445f [formerly c799d73430]
Former-commit-id: bbe1002d2d
2013-08-14 18:32:39 -05:00
Nate Jensen
1e75952565 Merge "Issue #2254 - Send an email to omaha_awips on unit test failures or errors" into development
Former-commit-id: f9af5f041e [formerly bc80d6f7dc] [formerly ce4d54ee5a] [formerly f08d3f4a9d [formerly ce4d54ee5a [formerly 22288cd9249420ffd643e5bb6d1f84bc6eda5326]]]
Former-commit-id: f08d3f4a9d
Former-commit-id: d6069bf8bb695ef3d66acffc9dbfab17426bbf87 [formerly d8812ab5f0]
Former-commit-id: 01f2bcd45c
2013-08-14 15:45:29 -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
84bef1f2ec Merge branch 'omaha_13.5.1' (13.5.1-15) into development
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java

Former-commit-id: 181df35afc [formerly 1f32ef9c7a] [formerly 5e5047cc4f] [formerly 2a9276c728 [formerly 5e5047cc4f [formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]]
Former-commit-id: 2a9276c728
Former-commit-id: 9c1694fcc8344cffbdb2feb402c25389a357d414 [formerly db7c941f6f]
Former-commit-id: c0b0eef331
2013-08-14 15:23:18 -05:00
Greg Armendariz
955f75647d Merge "Issue #2257 - updated edex_com to use the qpid 0.18 messaging api" into omaha_13.5.1
Former-commit-id: 0578f67668 [formerly e254c838ea] [formerly f02fef09a2] [formerly edf12d4d4f [formerly f02fef09a2 [formerly ced372967755b611158c213011132a353b72f421]]]
Former-commit-id: edf12d4d4f
Former-commit-id: 2b69fe3f0396919408641e48b2a327350177c289 [formerly e867472bf6]
Former-commit-id: c9980c9d3f
2013-08-14 15:00:26 -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
Mike Duff
ef2f04aa08 Issue #2254 - Send an email to omaha_awips on unit test failures or errors
Former-commit-id: ff37559dcd [formerly c7a76d191f] [formerly 18f11ce9e0] [formerly 0973d5018c [formerly 18f11ce9e0 [formerly 8e0e4e93a094c60c18b28a5ebc49a8f175e6f373]]]
Former-commit-id: 0973d5018c
Former-commit-id: 0c48d1b505be7fd95e34e1901fb3e14f19a95dde [formerly 6ac90578a1]
Former-commit-id: 1f3becc31e
2013-08-14 14:20:52 -05:00
Richard Peter
bb4f543c8a Merge "Issue #2196 changed ncfRegistry.sh EBXML_THRIFT_SERVICE_PORT to correspond to the port that the DPA looks for. Renamed registry mode to wfoRegistry mode. Renamed devWfoRegistry mode to devRegistry mode." into development
Former-commit-id: 6c7c5a5b4b [formerly 09e4f4f4da] [formerly bdf3d5a295] [formerly bca32c2e0a [formerly bdf3d5a295 [formerly 3f45f1988372462a7f541b9e76a893b1e2f4e1ae]]]
Former-commit-id: bca32c2e0a
Former-commit-id: 33c6f0656217ce1577fa695c01be18653cbe1953 [formerly 925f6cade4]
Former-commit-id: cc2bc4e366
2013-08-14 13:57:48 -05:00
Nate Jensen
edbd00224d Merge "Issue #2033 moved bundles and menu files into corresponding plugins" into development
Former-commit-id: 9407a5202a [formerly 3b97de573a] [formerly 9776721a46] [formerly 0947f358b1 [formerly 9776721a46 [formerly 34c2b29b569f9179d37c330bc2f8edf5d56edf6c]]]
Former-commit-id: 0947f358b1
Former-commit-id: 4e7d46f90eefa803d5b1de7984747157dee229fb [formerly b1882e2e42]
Former-commit-id: 49567ae86c
2013-08-14 12:55:15 -05:00
Brad Gonzales
bd8a061ef4 Issue #2196 changed ncfRegistry.sh EBXML_THRIFT_SERVICE_PORT to correspond to the port that the DPA looks for.
Renamed registry mode to wfoRegistry mode. Renamed devWfoRegistry mode to devRegistry mode.

Change-Id: I8793b2a5c6ebf0f2ce342103e81d48de1b3e2044

Former-commit-id: ec3646def6 [formerly 50a10b3efb] [formerly 533deffd53] [formerly 5d169e4df1 [formerly 533deffd53 [formerly b4ee9c5753571a8cdd0720986c76723f4e646f0c]]]
Former-commit-id: 5d169e4df1
Former-commit-id: 6534d32bcc0af9a21a9c40a2ef91bb08b973dcca [formerly f3bc3d9185]
Former-commit-id: 88fdc1e56b
2013-08-14 12:35:18 -05:00
Richard Peter
8a4e3714c2 Merge "Issue #2224 Bug fixes to pass unit test." into development
Former-commit-id: c489a4e9b2 [formerly a9ef2e7fd3] [formerly 1a3dfd45ab] [formerly 11229d4b51 [formerly 1a3dfd45ab [formerly 0063088d0cffc2e7c6ba12f055184dd85f8820ca]]]
Former-commit-id: 11229d4b51
Former-commit-id: c62c3b2c38e630e4071897d31b680ea252f1d4be [formerly 5eb9ca0e1a]
Former-commit-id: ea0ca8a055
2013-08-14 11:55:17 -05:00
Bryan Kowal
f2b5128ede Issue #2257 - updated edex_com to use the qpid 0.18 messaging api
- created the new awips2-qpid-lib rpm
- removed the ldm dependendency on awips2-notification (ldm still uses qpid 0.7)
- qpid 0.7 libraries are now packaged with ldm
- Amend: update the 32-bit build configurations
- Amend: improve error handling in the EdexNotification cleanup function

Change-Id: Iee8ec98304a6b5aea0d11044dd8779d2afa100c3

Former-commit-id: 67c9cbf70e [formerly ec0ef7fe80] [formerly fc8c3f540d] [formerly 21893102bb [formerly fc8c3f540d [formerly af2882799bd08998d1321bac37beb2a7cecb4fb9]]]
Former-commit-id: 21893102bb
Former-commit-id: 45802081a28e7bb32c87dfb2c52082cf8ae519fb [formerly c2c9d745af]
Former-commit-id: e76b46487c
2013-08-14 11:21:33 -05:00
Richard Peter
143973d9d0 Merge "Issue #2247 - Fix permission displays in UserAdmin Dialogs" into development
Former-commit-id: 2169c7ae71 [formerly 72ecb0b995] [formerly cfe449d838] [formerly 045d3cd618 [formerly cfe449d838 [formerly 247b8d0848b7cfcadfe2163938226f20e654a98d]]]
Former-commit-id: 045d3cd618
Former-commit-id: d416d75ca336101c5ae43270118c2986ff81ec92 [formerly 3f456db0f1]
Former-commit-id: f02fc50031
2013-08-14 10:53:53 -05:00
Roger Ferrel
8daa627e56 Issue #2224 Bug fixes to pass unit test.
Change-Id: I6f1c5721afaab21ade5a7f780ba92ca7b4ea8a00

Former-commit-id: d3a33f2855 [formerly 81a31214cd] [formerly caa97d7d09] [formerly 87f9cb2fb3 [formerly caa97d7d09 [formerly ca2bb73e1fd77bc289a106eb7743ee5344be3a52]]]
Former-commit-id: 87f9cb2fb3
Former-commit-id: f7dc5f884640b503af95dd11719fbe5689844939 [formerly 5be73428f0]
Former-commit-id: 87ca79b294
2013-08-14 10:25:49 -05:00
Mike Duff
d0df6c3107 Issue #2247 - Fix permission displays in UserAdmin Dialogs
Change-Id: I2b5e1a717cd741a38ae48e8df0d429a993d88fe4

Former-commit-id: 3959e7e9f8 [formerly e319928638] [formerly 097028ec59] [formerly e791617acc [formerly 097028ec59 [formerly ca3499309373b553874e7a89e8f38f30e9b041e6]]]
Former-commit-id: e791617acc
Former-commit-id: ba7884d6eb75737a8c3c26d231fc65031b3c02a1 [formerly 081d30db4f]
Former-commit-id: b70b7a0681
2013-08-14 10:13:05 -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
Max Schenkelberg
41cc45e8fc Issue #2033 moved bundles and menu files into corresponding plugins
Change-Id: Idb92afac5ffb83f115ca77c3917fc7ef61f38afc

Former-commit-id: 9be1171c33 [formerly 6c92aa9dd7] [formerly 5ab8b6e2c6] [formerly 06dbae8bdb [formerly 5ab8b6e2c6 [formerly fe1b35711ec55a022027bb8ff1a27924b3926911]]]
Former-commit-id: 06dbae8bdb
Former-commit-id: 116cd76f43f817c4146cfbf39bb00d7365fdbc12 [formerly 759ff7bcfd]
Former-commit-id: 2fc5af010d
2013-08-14 09:20:28 -05: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
Nate Jensen
67d028c561 Merge "Issue #2262 create new wxmath plugin seeded by Java derivparam functions" into development
Former-commit-id: a72d987b2e [formerly a50328f796] [formerly e4a9195477] [formerly c844396230 [formerly e4a9195477 [formerly 5b909886e84f0f6942a06367f223940e4448e315]]]
Former-commit-id: c844396230
Former-commit-id: 9d055ae25b28b02efc2fc1cfa94af89b4bcce17d [formerly ffed8deab6]
Former-commit-id: e3f8c316f2
2013-08-13 17:19:25 -05:00
Nate Jensen
dde8a77452 Issue #2262 create new wxmath plugin seeded by Java derivparam functions
Change-Id: If71c205a88ef17a2432267956bd05b9b10a56aa2

Former-commit-id: 9df41ff246 [formerly 23fe237b7e] [formerly 09872d6713] [formerly 959b50d184 [formerly 09872d6713 [formerly f3d233aeff8017c521288affd4b5be668c9a890a]]]
Former-commit-id: 959b50d184
Former-commit-id: 51c4ef63ff05fff6b408532bd09a5c1ae80588a3 [formerly 44ef756627]
Former-commit-id: aaee338f5c
2013-08-13 16:59:57 -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
Roger Ferrel
d3a5376597 Issue #2224 Quick for daily build until I figure out what is really wrong.
Change-Id: I589b04aae265239dc2cb2e34819ff28eb2ced8d6

Former-commit-id: ed22d942af [formerly 91b375e761] [formerly f4d6bf5ff3] [formerly ea862ea395 [formerly f4d6bf5ff3 [formerly 261e40897b011ea7f0aec668d57b65631a6c735f]]]
Former-commit-id: ea862ea395
Former-commit-id: 467e5b38475fe29d7c77be9e7a713528e59cb489 [formerly 05d0a371e2]
Former-commit-id: 3a402e1e52
2013-08-13 16:03:50 -05:00
Mike Duff
0d2c072dce Issue #2263 - remove build failure on unit test failure
Change-Id: I921470904bf894cf49c7952b6c5feba3caf5b83f

Former-commit-id: e1e84be2b9 [formerly 18f0ef68db] [formerly 367420ad48] [formerly 62c3e2107f [formerly 367420ad48 [formerly 57870e24ca02e1cb66705cac79fb8856685a56b3]]]
Former-commit-id: 62c3e2107f
Former-commit-id: 82b156d8e15bf36f13a55daced70457967e7b450 [formerly cac7a8d0da]
Former-commit-id: bd7c39692a
2013-08-13 14:54:24 -05:00
Nate Jensen
98b8bcaf15 Merge "Issue #2253 fix issue where warnings do not show up in the drop down in Warngen" into development
Former-commit-id: ee45599b10 [formerly b435eba010] [formerly f8d8e312f3] [formerly d995e29afe [formerly f8d8e312f3 [formerly 32053b62812fc375aebb5af21af1149b2b4944c5]]]
Former-commit-id: d995e29afe
Former-commit-id: d45c592549b4132053bd6601c4ebc9e98574f455 [formerly 759348ba2e]
Former-commit-id: f8a839a0a1
2013-08-13 12:34:44 -05:00
Greg Armendariz
23c92a0580 Merge "Issue #2164 - fix 13.6.1 build" into development
Former-commit-id: 0e4fb54616 [formerly 8bcfc737e6] [formerly 34b428b5a0] [formerly 84413bd66f [formerly 34b428b5a0 [formerly aa808c2ef1cbee907fbe910892a2c37fa5b0d45c]]]
Former-commit-id: 84413bd66f
Former-commit-id: f27556222bac4d9edcd174ff7f0a255be940034e [formerly dbae6131cb]
Former-commit-id: 02dfe84d31
2013-08-13 12:34:04 -05:00
Nate Jensen
f63ade7443 Merge "Issue #2142 removing more dependencies on edex.common" into development
Former-commit-id: d6a7d77ae6 [formerly 86e823cc9f] [formerly 260ea8a0b9] [formerly 576b8fa830 [formerly 260ea8a0b9 [formerly 725b2654ce507b302ac111a740f27460799ecd80]]]
Former-commit-id: 576b8fa830
Former-commit-id: 3bce82da0dd11c2290eaa18420eb44d314e94d13 [formerly 295b29860b]
Former-commit-id: 12fd3b3b8d
2013-08-13 12:32:09 -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
Matt Nash
5803a64603 Issue #2253 fix issue where warnings do not show up in the drop down in Warngen
Change-Id: I680948f5e5224da9f649632fd72ca0412eb9b186

Former-commit-id: 9289576049 [formerly 80172b1aba] [formerly 5aeda85fca] [formerly dda3d78b48 [formerly 5aeda85fca [formerly 1c72a8cfeeb9263f8d406002de9703a1ee73f40e]]]
Former-commit-id: dda3d78b48
Former-commit-id: 1d7ef8f99d91ca142fcc53e65be8304b5a111b8c [formerly ebb291e6c3]
Former-commit-id: fc6e2bf0c3
2013-08-13 11:59:35 -05:00
Bryan Kowal
ac9f30c364 Issue #2164 - fix 13.6.1 build
Former-commit-id: 17c4406504 [formerly dbaa6da3ea] [formerly 4604653241] [formerly 586b7646f0 [formerly 4604653241 [formerly 2bd27e20c50a3d9a9786bf2ecea4b7c24a38f371]]]
Former-commit-id: 586b7646f0
Former-commit-id: 35049ac07bfb3bc55f39b499e9526b76e59c3cf0 [formerly 8b3827c745]
Former-commit-id: d96ca6737c
2013-08-13 11:13:52 -05:00
Richard Peter
2be0bfe06c Merge "Issue #1822 created DataDeliveryRetrievalWmoHeaderApplier to generate WMO Header for data delivery retrievals." into development
Former-commit-id: 64496ad332 [formerly 3763073459] [formerly 3f6d8a28da] [formerly 60831564a0 [formerly 3f6d8a28da [formerly c4cc04a6b759f934a556004a242da4dfa4709653]]]
Former-commit-id: 60831564a0
Former-commit-id: b8c51d60a2d0aa03907fcbc0718b69115b70690e [formerly a4d9a82ca5]
Former-commit-id: 35a3e81478
2013-08-13 10:10:07 -05:00
Nate Jensen
766da72c20 Issue #2142 removing more dependencies on edex.common
Change-Id: I6fa6d1957f6aeee3b22f96164c7da4509b06eaaf

Former-commit-id: 5e24a11e06 [formerly 78256fd891] [formerly df95db8f78] [formerly 0c92461c65 [formerly df95db8f78 [formerly 231c873711159c9a59f0bc4e25e70cc9c989ecc0]]]
Former-commit-id: 0c92461c65
Former-commit-id: 19ebf5cd40eb632cc1ff7e301922bcea379b8369 [formerly bf821fdbe0]
Former-commit-id: 988ac46c2b
2013-08-13 09:09:05 -05:00
Nate Jensen
6d5db1a0ef Merge "Issue #2162: Add performance logging for GFE edit area query evaluation." into development
Former-commit-id: 9424d4d05e [formerly 9e283f0640] [formerly bb955e6ee7] [formerly e6fc534b8c [formerly bb955e6ee7 [formerly 731fb620ed8dec721c1fe4bbc0b55b4e11e1283f]]]
Former-commit-id: e6fc534b8c
Former-commit-id: a3cf360d5a76db93070e8919ea77aed528d12fca [formerly ea4355e018]
Former-commit-id: c370d3b7d0
2013-08-13 08:58:50 -05:00
Nate Jensen
b4d5ba2d2c Merge "Issue #2033 Fixed alertviz startup" into development
Former-commit-id: 74a6174e78 [formerly 5b3334b2ff] [formerly 58e7b31de9] [formerly c62139c327 [formerly 58e7b31de9 [formerly 3312f297f36ab27d9f9fb74d48bf291f60292e5a]]]
Former-commit-id: c62139c327
Former-commit-id: 0e55127933254744d7ac69d6ba3078acd0ce5ab4 [formerly 95010dbbf4]
Former-commit-id: d9e4590947
2013-08-13 08:56:24 -05:00
Nate Jensen
d037198231 Merge "Issue #2142 more removing of dependencies from common plugins to edex.common" into development
Former-commit-id: 7bbc2ec7d7 [formerly ce20de02a7] [formerly 5948ebca87] [formerly 8101c961d4 [formerly 5948ebca87 [formerly e9e46b68652caff85b2206180856654876f55f12]]]
Former-commit-id: 8101c961d4
Former-commit-id: e0c53384ed3969b5434ffaf4846c3219ee84cc83 [formerly 75f31b372e]
Former-commit-id: 835516348f
2013-08-13 08:56:01 -05:00
Max Schenkelberg
971c4d5184 Issue #2033 Fixed alertviz startup
Change-Id: Ife44d6be7fb31660ade005d46d3f376d8ed30ff5

Former-commit-id: 7598c95fd9 [formerly c825e2f0e2] [formerly 49381ac481] [formerly 3f35c335c9 [formerly 49381ac481 [formerly 1cdd5eab835f2df85f8ebc82d0bea79bca3977da]]]
Former-commit-id: 3f35c335c9
Former-commit-id: afbfb22a6fac492f6776c223cc090e8fa76b92f2 [formerly 17a28bf292]
Former-commit-id: c34cc88aa8
2013-08-12 17:37:15 -05:00
Nate Jensen
342649b95b Issue #2142 more removing of dependencies from common plugins to edex.common
Change-Id: I3ccb07227ef6adef233898e7fae6678ea4d18c7f

Former-commit-id: c137e92198 [formerly 23802cfe02] [formerly 28c79d0a56] [formerly c2bf2163d9 [formerly 28c79d0a56 [formerly 2342170ce4cf51f12759afa26fc5af46f35c6188]]]
Former-commit-id: c2bf2163d9
Former-commit-id: 80525ffd198786b7cfb596c35ca6de95bc0f8008 [formerly 018845db8f]
Former-commit-id: 2117ec71c6
2013-08-12 15:41:39 -05:00
Richard Peter
6dd74d080f Merge "Issue #2224 Changes to have DataSet in configuration." into development
Former-commit-id: 201004e203 [formerly 5548ae76b1] [formerly d8124958b5] [formerly 2de533cbbf [formerly d8124958b5 [formerly d4a46b8283ac0cb47f62c43b999d7f119161e08d]]]
Former-commit-id: 2de533cbbf
Former-commit-id: 36f4d2af4006b315ff6170d430184188400680b2 [formerly 4605595354]
Former-commit-id: e9651a43ed
2013-08-12 15:01:51 -05:00