xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6297 commits 31 branches 40 tags 3.8 GiB
Commit graph

3416 commits

Author SHA1 Message Date
Nate Jensen
f21b672114 Merge "Omaha #3245 fix GFE starting without a cave data" into omaha_14.4.1 
Former-commit-id: bb60b170e8 [formerly dcab909b4b] [formerly bb60b170e8 [formerly dcab909b4b] [formerly 7fc256d076 [formerly c632bf24ee15cc85da9d7e7fb0a295912bf06b78]]]
Former-commit-id: 7fc256d076
Former-commit-id: 1f9f0ba7f3 [formerly a499624f5f]
Former-commit-id: f94209e681
 2014-06-17 17:01:46 -05:00
Brian Clements
ed95461c36 Issue #2903 prevent shared display crash from missing point style enum value 
Change-Id: I9d3faccba56c2832c5dcc185c6c20bcce396b173

Former-commit-id: b8a0a60df6 [formerly 9946f78241] [formerly b8a0a60df6 [formerly 9946f78241] [formerly 5d03048fff [formerly 5d298b39786d37aa365ccfe2c337214d1e46f1a9]]]
Former-commit-id: 5d03048fff
Former-commit-id: dbe778cbe0 [formerly 59d92634b0]
Former-commit-id: 48e634b14a
 2014-06-17 17:01:23 -05:00
Nate Jensen
11753fc2d3 Omaha #3245 fix GFE starting without a cave data 
Change-Id: I61e9766bccd099619bfedfd9a1e1121fe63120d7

Former-commit-id: 2ce0e5aee5 [formerly 19aa9dc96e] [formerly 2ce0e5aee5 [formerly 19aa9dc96e] [formerly 8ab7d86a8f [formerly 539d497c5fc80efd5099e76a9e95a4709ace041d]]]
Former-commit-id: 8ab7d86a8f
Former-commit-id: 5129fee3e6 [formerly 451b265ce6]
Former-commit-id: e59c180fdc
 2014-06-17 16:31:20 -05:00
Nate Jensen
aec31b09bc Merge "Omaha #3078 added private chat to collaboration" into omaha_14.4.1 
Former-commit-id: 12ef85f665 [formerly 7fb85a1acc] [formerly 12ef85f665 [formerly 7fb85a1acc] [formerly c05ae83ea2 [formerly 2c2b3891003076484539ef5fa7d6772b6336c635]]]
Former-commit-id: c05ae83ea2
Former-commit-id: f925285131 [formerly 0d71d5dc2b]
Former-commit-id: 181da0bc6a
 2014-06-17 16:24:42 -05:00
Brian Clements
3702533a45 Omaha #3078 collaboration shared display data over private chat 
Change-Id: I0ede9310eb109adc1b08673027e9e36a68a09fbf

Former-commit-id: b518cb2418 [formerly 9a427606ae] [formerly b518cb2418 [formerly 9a427606ae] [formerly add8286d52 [formerly a51847aff197f805a4e48c9ecdb0c16f874e6a78]]]
Former-commit-id: add8286d52
Former-commit-id: 13bf7e0793 [formerly 06b7415cec]
Former-commit-id: a993d1f90a
 2014-06-17 14:32:17 -05:00
Nate Jensen
1b2612e117 Merge "Omaha #3110 Fix typos in revision comment and log message. Changed to log number of messages in queue instead of number being added to queue." into omaha_14.4.1 
Former-commit-id: bd2ef07395 [formerly d8dc6eceef] [formerly bd2ef07395 [formerly d8dc6eceef] [formerly acd7620d7a [formerly 6efd831efcc5372c7e7bfd52265d13de382407ee]]]
Former-commit-id: acd7620d7a
Former-commit-id: fe52a8f7f8 [formerly 485aced54c]
Former-commit-id: 479ccb41f4
 2014-06-17 14:21:55 -05:00
Ron Anderson
450ece09b7 Merge "Omaha #3274 switch viz to G1 garbage collector" into omaha_14.4.1 
Former-commit-id: b0a7be6203 [formerly d5c2170a20] [formerly b0a7be6203 [formerly d5c2170a20] [formerly 855b4ad7c1 [formerly a971a5b1d27611c8b3a9a47b76efafa0c2c7a9fc]]]
Former-commit-id: 855b4ad7c1
Former-commit-id: 32e707294a [formerly 79c6182cc9]
Former-commit-id: b6f47567b2
 2014-06-17 13:54:11 -05:00
Ron Anderson
f2c24187a2 Omaha #3110 Fix typos in revision comment and log message. 
Changed to log number of messages in queue instead of number being added to queue.

Change-Id: I0f6b2be8e62be964de993c6c66f042b371a80bd7

Former-commit-id: 404098d861 [formerly b7843361f6] [formerly 404098d861 [formerly b7843361f6] [formerly 1a8ccd0181 [formerly 0cf0e93eabd440cf0ca3e88ac36c62b3309b6527]]]
Former-commit-id: 1a8ccd0181
Former-commit-id: ed318889de [formerly e31eabe77b]
Former-commit-id: 2728191963
 2014-06-17 13:46:38 -05:00
Brian Clements
cdcf7d8143 Omaha #3078 added private chat to collaboration 
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae

Former-commit-id: 86e89665bf [formerly 37699395ef] [formerly 86e89665bf [formerly 37699395ef] [formerly 97a6f5bfe8 [formerly 93f7d7088e7d7888a878558c6f2fcc368bf3ab05]]]
Former-commit-id: 97a6f5bfe8
Former-commit-id: 51e2606277 [formerly 60508bf674]
Former-commit-id: 4433482d56
 2014-06-17 11:52:58 -05:00
Nate Jensen
54b72c7108 Omaha #3274 switch viz to G1 garbage collector 
Change-Id: I720c4ebb21bd3a37dcc71f8879bb96edb6a0b109

Former-commit-id: 14a520dbd9 [formerly 4a91c3320b] [formerly 14a520dbd9 [formerly 4a91c3320b] [formerly 44cb0e6ae6 [formerly 0355813f030ac996427c64dfcb6cbd4dd781ad2f]]]
Former-commit-id: 44cb0e6ae6
Former-commit-id: 439e037d03 [formerly 3981241355]
Former-commit-id: fe47ecf6ce
 2014-06-17 10:54:57 -05:00
Brian Clements
0dcfac1a44 Omaha #3288 collaboration feed venue config comes from server 
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0

Former-commit-id: 8205f7cd56 [formerly b6a2bf0ae4] [formerly 8205f7cd56 [formerly b6a2bf0ae4] [formerly 84e3f967d9 [formerly baab2ea12e1117446295ae60bc06228eb6139895]]]
Former-commit-id: 84e3f967d9
Former-commit-id: 4dc81aabfa [formerly 5436efb886]
Former-commit-id: 616315d830
 2014-06-17 09:26:24 -05:00
Nate Jensen
19383cbf10 Merge "Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings." into omaha_14.4.1 
Former-commit-id: 95b2e262a0 [formerly b1acd1709a] [formerly 95b2e262a0 [formerly b1acd1709a] [formerly 9b7ed95e6b [formerly 2ee54c1f78136332f1cd2c40da0c2e7953510e7f]]]
Former-commit-id: 9b7ed95e6b
Former-commit-id: 99b46cfbcf [formerly 521065548d]
Former-commit-id: ea80faede7
 2014-06-16 09:26:30 -05:00
Nate Jensen
2566b6419c Merge "Omaha #3265 Fix potential NPE in D2D time matching." into omaha_14.4.1 
Former-commit-id: c2766190a4 [formerly 5fad6501a7] [formerly c2766190a4 [formerly 5fad6501a7] [formerly b3df7745d4 [formerly 83d1a4b6e69e3fe1bb350beba4f36eb3bf34e05d]]]
Former-commit-id: b3df7745d4
Former-commit-id: ca06c42305 [formerly 752fe50104]
Former-commit-id: 35ed3931c3
 2014-06-16 09:00:47 -05:00
Nate Jensen
450611cd70 Merge "Omaha #3163 Fix NPE when styleless strings are sent to 14.3" into omaha_14.4.1 
Former-commit-id: 4544d7d3e0 [formerly 181a87e72d] [formerly 4544d7d3e0 [formerly 181a87e72d] [formerly 5908a4501a [formerly 34250721f97f05be61e9e4e8b6f71758347a9f60]]]
Former-commit-id: 5908a4501a
Former-commit-id: 8aa1e4aacb [formerly 442a3d9683]
Former-commit-id: e01ddac6ad
 2014-06-16 09:00:39 -05:00
Nate Jensen
cc66519671 Merge "Issue #2903 changed collaboration jaxb xml to be base64 encoded" into omaha_14.3.1 
Former-commit-id: eddc8f373a [formerly c2aa87470d] [formerly eddc8f373a [formerly c2aa87470d] [formerly ed36453f09 [formerly 93f63c0d42941001e4d59a4840df5e5b525592bf]]]
Former-commit-id: ed36453f09
Former-commit-id: 50715cc012 [formerly ef61539a8a]
Former-commit-id: 48496aeb9b
 2014-06-16 08:31:30 -05:00
Steve Harris
a0d17947a9 Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Former-commit-id: 97843cf58e [formerly 9213369739] [formerly 97843cf58e [formerly 9213369739] [formerly e1c8ad2611 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]]
Former-commit-id: e1c8ad2611
Former-commit-id: d7cd0ac02c [formerly 362988b9d7]
Former-commit-id: 8270fd8a9f
 2014-06-16 08:19:12 -05:00
Ben Steffensmeier
6594b9dbd8 Omaha #3265 Fix potential NPE in D2D time matching. 
Former-commit-id: 9caf60a551 [formerly 81fbf3b697] [formerly 9caf60a551 [formerly 81fbf3b697] [formerly 29b423645e [formerly 9fea363e4fd21f2e9dc06b9450b71eb174dd0a29]]]
Former-commit-id: 29b423645e
Former-commit-id: 18f1cd9d5b [formerly b0ff6298f1]
Former-commit-id: 07f36a59a7
 2014-06-13 16:58:35 -05:00
Ben Steffensmeier
307f065952 Omaha #3163 Fix NPE when styleless strings are sent to 14.3 
Former-commit-id: d2997f9fc0 [formerly 1f8f612d3a] [formerly d2997f9fc0 [formerly 1f8f612d3a] [formerly 7245544e1f [formerly 3c1dd0e7daea7149a02b1a5e2be1a0db27e662d5]]]
Former-commit-id: 7245544e1f
Former-commit-id: 1282f74317 [formerly 59b5076a66]
Former-commit-id: 991dff52d2
 2014-06-13 16:49:25 -05:00
Brian.Dyke
03f8202ff2 CM-MERGE:OB13.5.6-3 into 14.1.3 
Merge branch 'master_14.1.3_merge' into master_14.1.3


Former-commit-id: 06c565d74f [formerly 30d8644fa5] [formerly 06c565d74f [formerly 30d8644fa5] [formerly 482f915b42 [formerly 4b317062ce5c35823210cbbf023c0f0fc8051ef3]]]
Former-commit-id: 482f915b42
Former-commit-id: c1bd7a0c55 [formerly 072a4a9d63]
Former-commit-id: ce9ebc90f5
 2014-06-13 14:05:49 -04:00
Brian.Dyke
3da13f3d12 CM-MERGE:OB13.5.6-3 into 14.1.3 
Former-commit-id: 5064d24e26 [formerly 346bf852cd] [formerly 5064d24e26 [formerly 346bf852cd] [formerly 81832d97e5 [formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]]]
Former-commit-id: 81832d97e5
Former-commit-id: 764b729546 [formerly 4bca0769fb]
Former-commit-id: 766974a05d
 2014-06-13 13:21:19 -04:00
Nate Jensen
cfa8bc6903 Merge "Omaha #3263 Check for null when mosaic time matches." into omaha_14.4.1 
Former-commit-id: 254ba2762f [formerly ba2f130b13] [formerly 254ba2762f [formerly ba2f130b13] [formerly fc905ca588 [formerly c8f486ed32dfffff69ff9e9fefe1320c4ec009f4]]]
Former-commit-id: fc905ca588
Former-commit-id: 55ddf5dbe7 [formerly 907fc445a3]
Former-commit-id: 198da6201c
 2014-06-12 15:14:50 -05:00
Brian Clements
338f293065 Omaha #3267 fixed collaboration NPE possibility 
Change-Id: I9bc68be7d9106396a0c369e3181e15baf25ca260

Former-commit-id: 42e6e38c2e [formerly adbffa5ddd] [formerly 42e6e38c2e [formerly adbffa5ddd] [formerly 91eb7d40c2 [formerly a23e57f3d1a6f4213216a7e038b85b17b6628faa]]]
Former-commit-id: 91eb7d40c2
Former-commit-id: b1fac777f4 [formerly 3bdbf79eeb]
Former-commit-id: e13aeb0ca5
 2014-06-12 15:06:46 -05:00
Ben Steffensmeier
c73ec7db64 Omaha #3263 Check for null when mosaic time matches. 
Former-commit-id: c105de1a4c [formerly 5355ca8c1c] [formerly c105de1a4c [formerly 5355ca8c1c] [formerly df2fed2be3 [formerly 913d70b860c1f129d1632dfd1d84e5fbcca5e2d9]]]
Former-commit-id: df2fed2be3
Former-commit-id: 6309145495 [formerly ab616254bf]
Former-commit-id: 5e433c9871
 2014-06-12 15:00:26 -05:00
Nate Jensen
53fe673750 Merge "Omaha #2061 Remove dataURI from acars." into omaha_14.4.1 
Former-commit-id: dd10c76b19 [formerly 387b0604cc] [formerly dd10c76b19 [formerly 387b0604cc] [formerly d3417d8e45 [formerly 6e2588a672ceb81a922be9fcdac9a4212376ed5f]]]
Former-commit-id: d3417d8e45
Former-commit-id: 66c3efd784 [formerly 6220def099]
Former-commit-id: 4dc987369a
 2014-06-12 14:27:47 -05:00
Ben Steffensmeier
deaecfc649 Omaha #2061 Remove dataURI from acars. 
Former-commit-id: 0a6e99e9d1 [formerly f66725a515] [formerly 0a6e99e9d1 [formerly f66725a515] [formerly 35ad2f2b8d [formerly e8b5ea58ca12878922be01c815a354703f5f4387]]]
Former-commit-id: 35ad2f2b8d
Former-commit-id: 4e3a8e97fe [formerly e227d408db]
Former-commit-id: 81b4860e27
 2014-06-12 13:59:45 -05:00
Nate Jensen
985da469eb Omaha #3270 fix warngen manifest's register buddy 
Change-Id: I273bc344c60fb4c824241a28949a1ce9fb3020a2

Former-commit-id: eeb97a239a [formerly 31b3029e02] [formerly eeb97a239a [formerly 31b3029e02] [formerly 305564d6f0 [formerly 796e242b031087e08b9ba5e44664d6b400405c42]]]
Former-commit-id: 305564d6f0
Former-commit-id: eeb4824569 [formerly 0b185c3b6c]
Former-commit-id: 0a893a8692
 2014-06-12 13:58:27 -05:00
Brian Clements
88bc3a948e Issue #2903 changed collaboration jaxb xml to be base64 encoded 
Change-Id: I0de0db3bf455a14d747520f34ef66d986815e42c

Former-commit-id: 909561d871 [formerly 5424eb0258] [formerly 909561d871 [formerly 5424eb0258] [formerly ef0ecfd1d4 [formerly afcfdf1ed08cd64deb085b909f0965e4ab68d92d]]]
Former-commit-id: ef0ecfd1d4
Former-commit-id: 077976c912 [formerly 9e39c19a7d]
Former-commit-id: 649d0cf43f
 2014-06-12 13:40:33 -05:00
Nate Jensen
20d48d21f6 Merge "Omaha #3269 - Fix editing of Notifiers before saving Amend - Remove save confirmation dialog, rename buttons" into omaha_14.4.1 
Former-commit-id: cd10372371 [formerly 4ac8246386] [formerly cd10372371 [formerly 4ac8246386] [formerly f118e1b0e9 [formerly 88280dedea4b6065a5603ac26e982eab0a2e0e72]]]
Former-commit-id: f118e1b0e9
Former-commit-id: 595cb870bf [formerly 343b88e3b3]
Former-commit-id: 576fc405e5
 2014-06-12 12:36:14 -05:00
Richard Peter
8f55fcab69 Merge "Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200)." into omaha_14.4.1 
Former-commit-id: f4cd1ce52d [formerly df86770b4e] [formerly f4cd1ce52d [formerly df86770b4e] [formerly 7731e25983 [formerly 3285557835e929a6b7048f4445d1da45ae8e1325]]]
Former-commit-id: 7731e25983
Former-commit-id: 0ef48baedc [formerly 40e2813f50]
Former-commit-id: 52b9f0107f
 2014-06-12 12:35:24 -05:00
Nate Jensen
6f25339365 Omaha #3247 upgrade build.cave's xalan jar 
Change-Id: Idd4e0d583ef4ad91bcde99278e3e035f1f12e434

Former-commit-id: 1a94d51831 [formerly d4471bf759] [formerly 1a94d51831 [formerly d4471bf759] [formerly 95fe41966a [formerly c2d32dddb2bba04b46099d8745ff541989e1a281]]]
Former-commit-id: 95fe41966a
Former-commit-id: 08b53fe0fe [formerly a6fa27a1b8]
Former-commit-id: 7fac05ac42
 2014-06-12 11:38:22 -05:00
Slav Korolev
d6ef83e619 Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200). 
Former-commit-id: 8175aad0bf [formerly 2b877529ce] [formerly 8175aad0bf [formerly 2b877529ce] [formerly 16ec392c12 [formerly 0172e8f27b646a965e472f969f112a4e170d9f41]]]
Former-commit-id: 16ec392c12
Former-commit-id: fec8eb4fae [formerly d8ebeb4778]
Former-commit-id: a66dd879c7
 2014-06-12 12:24:34 -04:00
Mike Duff
a87ac48a53 Omaha #3269 - Fix editing of Notifiers before saving 
Amend - Remove save confirmation dialog, rename buttons

Change-Id: I0dd81db4c74d07f0535341fc410c288b077463c4

Former-commit-id: 522d3c70f2 [formerly 80922824a3] [formerly 522d3c70f2 [formerly 80922824a3] [formerly c920a24300 [formerly 47d57692c81757a8b8c0d3217e21f701f18cdf2c]]]
Former-commit-id: c920a24300
Former-commit-id: 0bdefaabdd [formerly b15b6514fd]
Former-commit-id: 5e0aa25048
 2014-06-12 11:21:15 -05:00
Roger Ferrel
06808134bf Omaha #3252 Fix bug in __makeHader to prevent unexpected exception. 
Former-commit-id: 09ae36d8de [formerly 960772ea44] [formerly 09ae36d8de [formerly 960772ea44] [formerly 42fe1bf5b2 [formerly 787261f13c47b5de81b2e7c4f861645614a11f1f]]]
Former-commit-id: 42fe1bf5b2
Former-commit-id: c43758bdbb [formerly 95d7540d05]
Former-commit-id: 5e9ed74eac
 2014-06-12 10:08:51 -05:00
Ben Steffensmeier
993da07002 Omaha #3217 Add always prompt option to thinclient connectivity dialog. 
Former-commit-id: 13e618cf89 [formerly b8f331bfba] [formerly 13e618cf89 [formerly b8f331bfba] [formerly c70462fb8a [formerly aac3fdd00b429932d9cfa5d950f9729ace54a933]]]
Former-commit-id: c70462fb8a
Former-commit-id: 726c91ed9e [formerly 96591c2ddb]
Former-commit-id: f6ea37ef66
 2014-06-11 17:00:16 -05:00
Ben Steffensmeier
2aebff4f06 Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings. 
Former-commit-id: 5a4f7a1fd4 [formerly f292f204c9] [formerly 5a4f7a1fd4 [formerly f292f204c9] [formerly fc25774506 [formerly e267e8b0bae314abf3396db6072c6ff8adc732bf]]]
Former-commit-id: fc25774506
Former-commit-id: 217734a2ba [formerly 94b465fa15]
Former-commit-id: 3c8b94e08a
 2014-06-11 13:45:42 -05:00
Nate Jensen
aa25da74a0 Merge "Omaha #3266 remove unused attributes and elements from baseline menu xml files" into omaha_14.4.1 
Former-commit-id: 17456be16c [formerly 04a6c1d5b7] [formerly 17456be16c [formerly 04a6c1d5b7] [formerly 4354bac2d5 [formerly b97df26a25976d58409dad8e43b1ca3ce7471133]]]
Former-commit-id: 4354bac2d5
Former-commit-id: d6e35301cf [formerly 753b7ddd5c]
Former-commit-id: 717523bf0e
 2014-06-11 13:09:34 -05:00
Ben Steffensmeier
3db0af5561 Omaha #2061 Remove IDecoderGettable from all AWIPS2 Raytheon PDOs. 
Former-commit-id: a96199cc47 [formerly d838ecc734] [formerly a96199cc47 [formerly d838ecc734] [formerly 30415ae8c5 [formerly b6c63e5791a2438253d6ff039b5164c61105a941]]]
Former-commit-id: 30415ae8c5
Former-commit-id: 08a1e07918 [formerly eb7cf7e8da]
Former-commit-id: 02c4332c6a
 2014-06-11 12:38:35 -05:00
David Friedman
3b686ca052 ASM #604 - Lightning display varies depending how long CAVE has been open 
Change-Id: Id85b87e21833ef00e80693b8526d976ccb4bb63e

Former-commit-id: 6d0d3f5ba5 [formerly b8542c1332] [formerly 6d0d3f5ba5 [formerly b8542c1332] [formerly 1c84c31e30 [formerly a3f4fd6537f3847011e199e0f043968d9f595937]]]
Former-commit-id: 1c84c31e30
Former-commit-id: 0ba91c6c28 [formerly 8c8f54994b]
Former-commit-id: d50646b479
 2014-06-11 13:37:16 +00:00
Nate Jensen
fa9e075a44 Omaha #3266 remove unused attributes and elements from baseline menu xml 
files

Change-Id: I1a1f75f2b2a314679487ddf719f4f0055bdf8d01

Former-commit-id: 23f3a15f31 [formerly 205e491d71] [formerly 23f3a15f31 [formerly 205e491d71] [formerly 955e115c00 [formerly 797504a970ec39c4fd56c9e0d51b292acfceea1b]]]
Former-commit-id: 955e115c00
Former-commit-id: f9d4da37b1 [formerly f634182937]
Former-commit-id: 70589056d1
 2014-06-10 18:30:14 -05:00
Nate Jensen
f5c593071a Merge "Omaha #2061 Delete PlotResource, rename PlotResource2." into omaha_14.4.1 
Former-commit-id: be169a7f63 [formerly 6890ee0920] [formerly be169a7f63 [formerly 6890ee0920] [formerly 10207907d8 [formerly b0903898a40916383f88b920e87dfc072d9cafa9]]]
Former-commit-id: 10207907d8
Former-commit-id: 789d9be951 [formerly 33b22ece81]
Former-commit-id: 57f48654ac
 2014-06-10 17:14:53 -05:00
Ben Steffensmeier
c0b8a49ee9 Omaha #3263 Synchronize dataTimes of storm track resources. 
Former-commit-id: 8783e9e23c [formerly eff1921f70] [formerly 8783e9e23c [formerly eff1921f70] [formerly cad15768cc [formerly d0a3a73a3a2375a49dc3e224a1c13956530d3351]]]
Former-commit-id: cad15768cc
Former-commit-id: e4ac81c0e9 [formerly b02383f878]
Former-commit-id: f60667703f
 2014-06-10 16:34:44 -05:00
Ben Steffensmeier
178b7509db Omaha #2061 Delete PlotResource, rename PlotResource2. 
Former-commit-id: bcc7243358 [formerly 1e37d669d8] [formerly bcc7243358 [formerly 1e37d669d8] [formerly a98872cb89 [formerly b569c7c3e175ed1519576aea63048c3f675d3875]]]
Former-commit-id: a98872cb89
Former-commit-id: bbcec7c004 [formerly d40c6fd625]
Former-commit-id: 6a5b6dcf8e
 2014-06-10 15:59:15 -05:00
Brian.Dyke
1ae1410e46 Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 0f07e14bf1 [formerly f72380ad60] [formerly 0f07e14bf1 [formerly f72380ad60] [formerly 9ab17ddecb [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]]
Former-commit-id: 9ab17ddecb
Former-commit-id: 816dcf74e4 [formerly 49cd9574d9]
Former-commit-id: a4b39dfca5
 2014-06-10 13:56:03 -04:00
Brian.Dyke
a39afc1dfa CM-MERGE:OB13.5.6-1,-2 into 14.1.3 
Former-commit-id: ef5c74dece [formerly c1b3f9d180] [formerly ef5c74dece [formerly c1b3f9d180] [formerly 8874d41872 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]]
Former-commit-id: 8874d41872
Former-commit-id: 4f0fc67b1f [formerly f568b5606a]
Former-commit-id: 81d732477e
 2014-06-10 12:52:59 -04:00
Nate Jensen
4299caf439 Merge "Omaha #3226 added total lightning decoder" into omaha_14.4.1 
Former-commit-id: a8022b8363 [formerly c8b6324240] [formerly a8022b8363 [formerly c8b6324240] [formerly 19bef8d080 [formerly ffa3e069c0beb5678ecb863b2950556d8c289ae1]]]
Former-commit-id: 19bef8d080
Former-commit-id: 87abeb25b9 [formerly 1d619bcf95]
Former-commit-id: 17e3c5f898
 2014-06-09 09:38:50 -05:00
Mike Duff
bb122607cc ASM #605 - Cherry-pick Omaha Issue #2954 from 14.3.1 into 14.2.2 to fix CAVE not starting if scale bundle is missing. 
Change-Id: I3f7159b7a48e74fc9ad7a4220d6c30b67240aca1

Former-commit-id: b876d9755a [formerly 81ab64d7ff] [formerly b876d9755a [formerly 81ab64d7ff] [formerly 39173c380c [formerly 7fe0dae041cb68aba968e22d5895cce22a210ee6]]]
Former-commit-id: 39173c380c
Former-commit-id: 60fe02137f [formerly b880d171d4]
Former-commit-id: 4b9f707a06
 2014-06-06 16:03:14 -04:00
Brian Clements
8046cbc417 Omaha #3226 added total lightning decoder 
refactored binlightning to support pulse data
renamed strikeCount dataset to pulseCount
added initial cave support for total lightning

Change-Id: I67f8a0f26a615ddefb9ff7f7d7d78bb05f0877f3

Former-commit-id: 2e445986e2 [formerly c278000764] [formerly 2e445986e2 [formerly c278000764] [formerly f39896b2d1 [formerly e2583481a77d08249030838ebd52eed6e54b2986]]]
Former-commit-id: f39896b2d1
Former-commit-id: 77b1f85fe1 [formerly b98a3494fe]
Former-commit-id: ca1b869647
 2014-06-06 14:39:57 -05:00
Nate Jensen
10350a1337 Merge "Omaha #3232 Radar code improvements." into omaha_14.4.1 
Former-commit-id: 5e9faea6e7 [formerly 3b324093ae] [formerly 5e9faea6e7 [formerly 3b324093ae] [formerly 920e53628b [formerly 22a5da1feff7e30ea0408f089305d95657befad2]]]
Former-commit-id: 920e53628b
Former-commit-id: f2d753fa64 [formerly c0f047b24f]
Former-commit-id: 24f7247805
 2014-06-05 17:38:32 -05:00
Ben Steffensmeier
dc5a927bb8 Omaha #3232 Radar code improvements. 
Former-commit-id: 3eb6b79c56 [formerly 8587b9b43b] [formerly 3eb6b79c56 [formerly 8587b9b43b] [formerly 26325b57be [formerly 696f45d67c5e5b02183f97cfcc139db017f01848]]]
Former-commit-id: 26325b57be
Former-commit-id: 4f83edfa72 [formerly b8fe181c9a]
Former-commit-id: 9e97750df2
 2014-06-05 14:53:25 -05:00
Michael Gamazaychikov
94595e6af4 ASM #114 - Problem with Distance Speed Tool. 
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75

Former-commit-id: e5a9fa0827 [formerly c07bcacbf8] [formerly e5a9fa0827 [formerly c07bcacbf8] [formerly 50ab77046b [formerly a38308fa5a6efe9a07ecd84bd93662bea32afc94]]]
Former-commit-id: 50ab77046b
Former-commit-id: a2423cfadc [formerly 5efb82ea3e]
Former-commit-id: 29e197404f
 2014-06-05 13:43:04 +01:00