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

6093 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Clements
0a6bc2631f Omaha #3214 added pulse and cloud flash rendering to cave 
Change-Id: Ibb842c0088b959e9ffc88c4db51f4c1bcc77d3ce

Former-commit-id: a18069809a [formerly 6345119f9b [formerly 7dd90e6f85] [formerly a18069809a [formerly 136bb5feca753f83f53d9d1e9381061853edc402]]]
Former-commit-id: 6345119f9b [formerly 7dd90e6f85]
Former-commit-id: 6345119f9b
Former-commit-id: 24e406cbf2
 2014-06-19 12:50:56 -05:00
Nate Jensen
a5ece8f658 Merge "Omaha #3255 Remove cxf from cave feature to fix build" into omaha_14.4.1 
Former-commit-id: 27df878d86 [formerly c19f10ddd4 [formerly 66cb3d5f03] [formerly 27df878d86 [formerly 73c71e83588237e0a39d173c648f68a8e35bf119]]]
Former-commit-id: c19f10ddd4 [formerly 66cb3d5f03]
Former-commit-id: c19f10ddd4
Former-commit-id: e81d51e479
 2014-06-19 10:59:35 -05:00
Benjamin Phillippe
e4fc37e138 Omaha #3255 Remove cxf from cave feature to fix build 
Former-commit-id: fc024e6d4c [formerly 8428c676d7 [formerly 8d2605199e] [formerly fc024e6d4c [formerly b6f01bfe3f45ab4c3299879db44763994f7f8222]]]
Former-commit-id: 8428c676d7 [formerly 8d2605199e]
Former-commit-id: 8428c676d7
Former-commit-id: f3d556e3c2
 2014-06-19 10:58:11 -05:00
Nate Jensen
7c6f4a1399 Merge "Omaha #2061 Fix recco." into omaha_14.4.1 
Former-commit-id: 505cef31a6 [formerly d461865ffa [formerly 95d705424c] [formerly 505cef31a6 [formerly 944598e429d2e4e01fceb0081991d83812055e3f]]]
Former-commit-id: d461865ffa [formerly 95d705424c]
Former-commit-id: d461865ffa
Former-commit-id: 8326b63fb2
 2014-06-19 10:52:46 -05:00
Nate Jensen
eb55fbc742 Merge "Omaha #3242 clean up more graphs" into omaha_14.4.1 
Former-commit-id: a3fe508711 [formerly 870b7964b4 [formerly 9a459f2da7] [formerly a3fe508711 [formerly 9f08e582b7eaf37741bbcee83692b9efe2859ea1]]]
Former-commit-id: 870b7964b4 [formerly 9a459f2da7]
Former-commit-id: 870b7964b4
Former-commit-id: e2ddb7ce2c
 2014-06-19 10:52:28 -05:00
Ben Steffensmeier
a7ef8c755d Omaha #2061 Fix recco. 
Former-commit-id: 135452a593 [formerly 6c3a3cc707 [formerly d953e65ac9] [formerly 135452a593 [formerly 16f0ae623de79d7a46573f2ec3833403d6cfd79f]]]
Former-commit-id: 6c3a3cc707 [formerly d953e65ac9]
Former-commit-id: 6c3a3cc707
Former-commit-id: 16024ca33a
 2014-06-19 10:46:29 -05:00
Nate Jensen
9810acc48c Merge "Omaha #2061 Remove another reference to IDecoderGettable." into omaha_14.4.1 
Former-commit-id: 5d209448da [formerly 67d6e9ce3b [formerly 17554ba5c9] [formerly 5d209448da [formerly 5741f0c527a75700bb0f745bbbdaf95929607e9d]]]
Former-commit-id: 67d6e9ce3b [formerly 17554ba5c9]
Former-commit-id: 67d6e9ce3b
Former-commit-id: 4df0dc8ff5
 2014-06-19 10:12:18 -05:00
Greg Armendariz
830659b354 Omaha #3299 - Fix qpid dependency 
Former-commit-id: 9d1630a617 [formerly 74500b05fc [formerly 9d9ba5a78f] [formerly 9d1630a617 [formerly d292734da643f003d9d04e03b32727bf9c007443]]]
Former-commit-id: 74500b05fc [formerly 9d9ba5a78f]
Former-commit-id: 74500b05fc
Former-commit-id: 261677faf9
 2014-06-19 09:56:10 -05:00
Nate Jensen
463ef2eebf Omaha #3242 clean up more graphs 
Change-Id: I2440877381afc684cb2a3b02cbdbe36905643de4

Former-commit-id: 7bb2aebd59 [formerly 9e317cb9bc [formerly aca7b46243] [formerly 7bb2aebd59 [formerly 667817cf9473889f8c5cc39dd71814f1181a3805]]]
Former-commit-id: 9e317cb9bc [formerly aca7b46243]
Former-commit-id: 9e317cb9bc
Former-commit-id: 069075ddd5
 2014-06-18 18:23:36 -05:00
Nate Jensen
e96fb2bacb Merge "Omaha #3242 thread safety for inset map" into omaha_14.4.1 
Former-commit-id: 835b65b7b8 [formerly a83159ff6a [formerly 55bd088ce5] [formerly 835b65b7b8 [formerly 43684d4c0fe8f4b79ef384c08d01d2bdd51990e6]]]
Former-commit-id: a83159ff6a [formerly 55bd088ce5]
Former-commit-id: a83159ff6a
Former-commit-id: c882f1c656
 2014-06-18 17:17:17 -05:00
Nate Jensen
5b67422f17 Merge "Omaha #3242 support ensemble id in time series legends" into omaha_14.4.1 
Former-commit-id: fbd7e64fe2 [formerly 393718bf41 [formerly f0e0866155] [formerly fbd7e64fe2 [formerly 84257c99914950f412f1e3d8c12b691fb428086f]]]
Former-commit-id: 393718bf41 [formerly f0e0866155]
Former-commit-id: 393718bf41
Former-commit-id: 679c3cfc12
 2014-06-18 17:17:04 -05:00
Nate Jensen
1d65c484cf Merge "Omaha #3242 fix errors that can occur if a user zooms or pans while the time series is still loading" into omaha_14.4.1 
Former-commit-id: 9a76fd4db0 [formerly 43a6ca22ac [formerly 0db147238d] [formerly 9a76fd4db0 [formerly 968613aaa91648a8e860eff88293744ddc00464c]]]
Former-commit-id: 43a6ca22ac [formerly 0db147238d]
Former-commit-id: 43a6ca22ac
Former-commit-id: 9d943b869c
 2014-06-18 17:07:19 -05:00
Nate Jensen
bfdf9290eb Omaha #3242 thread safety for inset map 
Change-Id: I358dfcb211444407095cd86657dee8ad522b5857

Former-commit-id: 30e76a1fd5 [formerly 33f858e951 [formerly 9b98b63bb5] [formerly 30e76a1fd5 [formerly d06eedeefc7997f6c881cf267c7f24979afbd9d7]]]
Former-commit-id: 33f858e951 [formerly 9b98b63bb5]
Former-commit-id: 33f858e951
Former-commit-id: 63adaa42b1
 2014-06-18 17:02:10 -05:00
Nate Jensen
c77a525d2e Omaha #3242 fix errors that can occur if a user zooms or pans while the 
time series is still loading

Change-Id: Ibcdc9681c651731f7da554c8cca40e260303aebb

Former-commit-id: 3ba4931eee [formerly b6ba8c0a3d [formerly a18fa3f026] [formerly 3ba4931eee [formerly 7999e026e8ff02ccb0f155af8770b0d8aac43339]]]
Former-commit-id: b6ba8c0a3d [formerly a18fa3f026]
Former-commit-id: b6ba8c0a3d
Former-commit-id: 718c6f8901
 2014-06-18 16:48:48 -05:00
Nate Jensen
4d03bb7dd7 Omaha #3242 fix error if user zooms on cross section before it's loaded 
Change-Id: I9143840a5074e4e5c9995c94cb21686598d79830

Former-commit-id: 46c843f51a [formerly aa579b85e7 [formerly 1add8fca08] [formerly 46c843f51a [formerly 4a7eebe03c9cd84702e6cda1258503da725a10bb]]]
Former-commit-id: aa579b85e7 [formerly 1add8fca08]
Former-commit-id: aa579b85e7
Former-commit-id: 472b055826
 2014-06-18 16:37:49 -05:00
Nate Jensen
fe523beab0 Omaha #3242 support ensemble id in time series legends 
Change-Id: I7f8435d274d3981e4871a5cf726bbf69e22a0d08

Former-commit-id: e10a73c17b [formerly 73082de461 [formerly 1a8995fc2d] [formerly e10a73c17b [formerly 453c1eecf4f08203b4c6e2a74ad5dc366d85d359]]]
Former-commit-id: 73082de461 [formerly 1a8995fc2d]
Former-commit-id: 73082de461
Former-commit-id: 9fad6c4712
 2014-06-18 15:37:14 -05:00
Benjamin Phillippe
2da7a91a88 Omaha #3255 Fix build 
Former-commit-id: bc9e7f1cb3 [formerly ebecdaeb36 [formerly 3864eb622e] [formerly bc9e7f1cb3 [formerly cd985e372ebdd705e1e93c4760fc02f229ddfddd]]]
Former-commit-id: ebecdaeb36 [formerly 3864eb622e]
Former-commit-id: ebecdaeb36
Former-commit-id: ce6d87cdcb
 2014-06-18 14:03:23 -05:00
Benjamin Phillippe
8489698865 Omaha #3255 Fixing Build 
Former-commit-id: 7e7cecceea [formerly a50a8e79a1 [formerly 621a3f1a5c] [formerly 7e7cecceea [formerly a2a18d6f4a9f536172c264eeeee3ff51e225981f]]]
Former-commit-id: a50a8e79a1 [formerly 621a3f1a5c]
Former-commit-id: a50a8e79a1
Former-commit-id: 2451e01f8f
 2014-06-18 13:57:27 -05:00
Nate Jensen
f17cee7558 Merge "Omaha #3255 Dependency cleanup" into omaha_14.4.1 
Former-commit-id: 9fd4e4a8d9 [formerly 0167a89312 [formerly 042b69ba9a] [formerly 9fd4e4a8d9 [formerly b209ae6772fe33ca73a130468c4c314f86ffeba5]]]
Former-commit-id: 0167a89312 [formerly 042b69ba9a]
Former-commit-id: 0167a89312
Former-commit-id: 45f7c49885
 2014-06-18 12:14:45 -05:00
Ben Steffensmeier
b612ebadf0 Omaha #2061 Remove another reference to IDecoderGettable. 
Former-commit-id: 7b356e8ce0 [formerly a55d42d479 [formerly cc72f9d983] [formerly 7b356e8ce0 [formerly bdca92f18fa4a7348dd82d9f2348583398dd5c30]]]
Former-commit-id: a55d42d479 [formerly cc72f9d983]
Former-commit-id: a55d42d479
Former-commit-id: 6f80f2f865
 2014-06-18 12:12:01 -05:00
Nate Jensen
ff06bf1465 Merge "Omaha #3274 fix generation of viz .ini files" into omaha_14.4.1 
Former-commit-id: 32bc3e4056 [formerly 079828ecce [formerly b3e73d78cc] [formerly 32bc3e4056 [formerly 5d378ca9529b48bd0a1422aec3263310f8350161]]]
Former-commit-id: 079828ecce [formerly b3e73d78cc]
Former-commit-id: 079828ecce
Former-commit-id: 0b6265a9b5
 2014-06-18 11:11:34 -05:00
Nate Jensen
05093edd00 Omaha #3274 fix generation of viz .ini files 
Change-Id: I5ca9b02310cd068df5ee30acf47396070142dfc7

Former-commit-id: 17dc45e7ca [formerly f958ca8de2 [formerly 465a0fef71] [formerly 17dc45e7ca [formerly dd628b80f7798bb66d3c54568b9549e66870ddec]]]
Former-commit-id: f958ca8de2 [formerly 465a0fef71]
Former-commit-id: f958ca8de2
Former-commit-id: 68679fd1a5
 2014-06-18 10:03:17 -05:00
Benjamin Phillippe
f717389470 Omaha #3255 Dependency cleanup 
Change-Id: Ic405d8f4fbe3f778d7e542529d566678c445647e

Former-commit-id: c2ed8a39d1 [formerly b41f79658f [formerly 270caaadde] [formerly c2ed8a39d1 [formerly dbac62df979f23402594dc6439b53e7884ea1bd1]]]
Former-commit-id: b41f79658f [formerly 270caaadde]
Former-commit-id: b41f79658f
Former-commit-id: 50e9bbd139
 2014-06-18 09:54:40 -05:00
Steve Harris
21450e73ba Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts (these go to ufcore):
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/AbstractGraphicsTarget.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/cmenu/ChangePointStyleAction.java


Former-commit-id: 676948e239 [formerly 9de49b59ea [formerly cc7e6bc52a] [formerly 676948e239 [formerly da50f581c90ea0cca5f43c45c44cb8ac045a6c8c]]]
Former-commit-id: 9de49b59ea [formerly cc7e6bc52a]
Former-commit-id: 9de49b59ea
Former-commit-id: 3e2eeedc29
 2014-06-18 08:52:25 -05:00
Nate Jensen
434a407d07 Merge "Omaha #3078 collaboration shared display data over private chat" into omaha_14.4.1 
Former-commit-id: 764f977bf6 [formerly 344a6b80ef [formerly a2783be56a] [formerly 764f977bf6 [formerly 4468390aaf89456e93b45fca20aeca7fb96d8c12]]]
Former-commit-id: 344a6b80ef [formerly a2783be56a]
Former-commit-id: 344a6b80ef
Former-commit-id: 7299d9ccb8
 2014-06-17 18:09:33 -05:00
Nate Jensen
e936884924 Merge "Omaha #3245 fix GFE starting without a cave data" into omaha_14.4.1 
Former-commit-id: 7fc256d076 [formerly bb60b170e8 [formerly dcab909b4b] [formerly 7fc256d076 [formerly c632bf24ee15cc85da9d7e7fb0a295912bf06b78]]]
Former-commit-id: bb60b170e8 [formerly dcab909b4b]
Former-commit-id: bb60b170e8
Former-commit-id: b0d4a3006b
 2014-06-17 17:01:46 -05:00
Brian Clements
5a4f4319b8 Issue #2903 prevent shared display crash from missing point style enum value 
Change-Id: I9d3faccba56c2832c5dcc185c6c20bcce396b173

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

Former-commit-id: 8ab7d86a8f [formerly 2ce0e5aee5 [formerly 19aa9dc96e] [formerly 8ab7d86a8f [formerly 539d497c5fc80efd5099e76a9e95a4709ace041d]]]
Former-commit-id: 2ce0e5aee5 [formerly 19aa9dc96e]
Former-commit-id: 2ce0e5aee5
Former-commit-id: 3828961fa0
 2014-06-17 16:31:20 -05:00
Nate Jensen
cc33fb9aa8 Merge "Omaha #3078 added private chat to collaboration" into omaha_14.4.1 
Former-commit-id: c05ae83ea2 [formerly 12ef85f665 [formerly 7fb85a1acc] [formerly c05ae83ea2 [formerly 2c2b3891003076484539ef5fa7d6772b6336c635]]]
Former-commit-id: 12ef85f665 [formerly 7fb85a1acc]
Former-commit-id: 12ef85f665
Former-commit-id: 58a8a337d1
 2014-06-17 16:24:42 -05:00
Brian Clements
59cacf0a71 Omaha #3078 collaboration shared display data over private chat 
Change-Id: I0ede9310eb109adc1b08673027e9e36a68a09fbf

Former-commit-id: add8286d52 [formerly b518cb2418 [formerly 9a427606ae] [formerly add8286d52 [formerly a51847aff197f805a4e48c9ecdb0c16f874e6a78]]]
Former-commit-id: b518cb2418 [formerly 9a427606ae]
Former-commit-id: b518cb2418
Former-commit-id: bb4ff41368
 2014-06-17 14:32:17 -05:00
Nate Jensen
5a69c61ec1 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: acd7620d7a [formerly bd2ef07395 [formerly d8dc6eceef] [formerly acd7620d7a [formerly 6efd831efcc5372c7e7bfd52265d13de382407ee]]]
Former-commit-id: bd2ef07395 [formerly d8dc6eceef]
Former-commit-id: bd2ef07395
Former-commit-id: 1dcfbab3fd
 2014-06-17 14:21:55 -05:00
Ron Anderson
d0c6dee7e1 Merge "Omaha #3274 switch viz to G1 garbage collector" into omaha_14.4.1 
Former-commit-id: 855b4ad7c1 [formerly b0a7be6203 [formerly d5c2170a20] [formerly 855b4ad7c1 [formerly a971a5b1d27611c8b3a9a47b76efafa0c2c7a9fc]]]
Former-commit-id: b0a7be6203 [formerly d5c2170a20]
Former-commit-id: b0a7be6203
Former-commit-id: 39bf0a24c0
 2014-06-17 13:54:11 -05:00
Ron Anderson
2d8972af1e 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: 1a8ccd0181 [formerly 404098d861 [formerly b7843361f6] [formerly 1a8ccd0181 [formerly 0cf0e93eabd440cf0ca3e88ac36c62b3309b6527]]]
Former-commit-id: 404098d861 [formerly b7843361f6]
Former-commit-id: 404098d861
Former-commit-id: 8e920811f3
 2014-06-17 13:46:38 -05:00
Brian Clements
972fafcdc1 Omaha #3078 added private chat to collaboration 
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae

Former-commit-id: 97a6f5bfe8 [formerly 86e89665bf [formerly 37699395ef] [formerly 97a6f5bfe8 [formerly 93f7d7088e7d7888a878558c6f2fcc368bf3ab05]]]
Former-commit-id: 86e89665bf [formerly 37699395ef]
Former-commit-id: 86e89665bf
Former-commit-id: 8fee2a762c
 2014-06-17 11:52:58 -05:00
Nate Jensen
751fe3c2e1 Merge "Omaha #3288 collaboration feed venue config comes from server" into omaha_14.4.1 
Former-commit-id: d334c16d1c [formerly 1df0cf7aff [formerly 812f679b22] [formerly d334c16d1c [formerly 615a1baccb5f263bd29a5e4a6da95f1a8c6e6568]]]
Former-commit-id: 1df0cf7aff [formerly 812f679b22]
Former-commit-id: 1df0cf7aff
Former-commit-id: b774f28cc8
 2014-06-17 11:19:03 -05:00
Nate Jensen
4e6ecac7df Omaha #3274 switch viz to G1 garbage collector 
Change-Id: I720c4ebb21bd3a37dcc71f8879bb96edb6a0b109

Former-commit-id: 44cb0e6ae6 [formerly 14a520dbd9 [formerly 4a91c3320b] [formerly 44cb0e6ae6 [formerly 0355813f030ac996427c64dfcb6cbd4dd781ad2f]]]
Former-commit-id: 14a520dbd9 [formerly 4a91c3320b]
Former-commit-id: 14a520dbd9
Former-commit-id: 172777137a
 2014-06-17 10:54:57 -05:00
Brian Clements
208e22d839 Omaha #3288 collaboration feed venue config comes from server 
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0

Former-commit-id: 84e3f967d9 [formerly 8205f7cd56 [formerly b6a2bf0ae4] [formerly 84e3f967d9 [formerly baab2ea12e1117446295ae60bc06228eb6139895]]]
Former-commit-id: 8205f7cd56 [formerly b6a2bf0ae4]
Former-commit-id: 8205f7cd56
Former-commit-id: f38f9fae51
 2014-06-17 09:26:24 -05:00
Nate Jensen
42b7a0fd7d Omaha #3255 attempt to fix build 
Change-Id: I8b21eaebaa60a7051ccbc9d12d33df742c471f25

Former-commit-id: 3c57231c82 [formerly 985c88d38b [formerly bc48674092] [formerly 3c57231c82 [formerly 4e8c5f881272ed8d7aea30cd8316ebcbdd2443c3]]]
Former-commit-id: 985c88d38b [formerly bc48674092]
Former-commit-id: 985c88d38b
Former-commit-id: af077fdf89
 2014-06-17 08:42:29 -05:00
Nate Jensen
903385bb8f Omaha #3255 fix build 
Change-Id: I0bff28eb7d430c7a789539a76c893ecf0a64ac46

Former-commit-id: c65c392d63 [formerly 4fd29b211a [formerly a8bae916f3] [formerly c65c392d63 [formerly 579cef6ab063bae1df0cfe85411d174dc75b08bd]]]
Former-commit-id: 4fd29b211a [formerly a8bae916f3]
Former-commit-id: 4fd29b211a
Former-commit-id: 382fd79fb5
 2014-06-17 07:40:18 -05:00
Ben Steffensmeier
ee89d869ca Omaha #2061 Update ncep copies of radar resources. 
Former-commit-id: 8064a74866 [formerly 8d521a40d0 [formerly 14b5c0d792] [formerly 8064a74866 [formerly 64b5e484c0dd8409ab0b791763c31681c94a38d3]]]
Former-commit-id: 8d521a40d0 [formerly 14b5c0d792]
Former-commit-id: 8d521a40d0
Former-commit-id: 7e5eb9d3ae
 2014-06-16 10:56:40 -05:00
Nate Jensen
b6ed6b492a Merge "Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings." into omaha_14.4.1 
Former-commit-id: 9b7ed95e6b [formerly 95b2e262a0 [formerly b1acd1709a] [formerly 9b7ed95e6b [formerly 2ee54c1f78136332f1cd2c40da0c2e7953510e7f]]]
Former-commit-id: 95b2e262a0 [formerly b1acd1709a]
Former-commit-id: 95b2e262a0
Former-commit-id: 40c2a6c486
 2014-06-16 09:26:30 -05:00
Nate Jensen
25fc3790a9 Merge "Omaha #3265 Fix potential NPE in D2D time matching." into omaha_14.4.1 
Former-commit-id: b3df7745d4 [formerly c2766190a4 [formerly 5fad6501a7] [formerly b3df7745d4 [formerly 83d1a4b6e69e3fe1bb350beba4f36eb3bf34e05d]]]
Former-commit-id: c2766190a4 [formerly 5fad6501a7]
Former-commit-id: c2766190a4
Former-commit-id: edfb0ca7d5
 2014-06-16 09:00:47 -05:00
Nate Jensen
3fdde249ff Merge "Omaha #3163 Fix NPE when styleless strings are sent to 14.3" into omaha_14.4.1 
Former-commit-id: 5908a4501a [formerly 4544d7d3e0 [formerly 181a87e72d] [formerly 5908a4501a [formerly 34250721f97f05be61e9e4e8b6f71758347a9f60]]]
Former-commit-id: 4544d7d3e0 [formerly 181a87e72d]
Former-commit-id: 4544d7d3e0
Former-commit-id: f29aea8b46
 2014-06-16 09:00:39 -05:00
Greg Armendariz
ad4d1801f9 Merge "Omaha #3247 - Update qpid dependency" into omaha_14.4.1 
Former-commit-id: 8c568a223e [formerly e73a0de182 [formerly faebbc13f7] [formerly 8c568a223e [formerly 2484a3407392f64b51b93bd3a4dab04194debea5]]]
Former-commit-id: e73a0de182 [formerly faebbc13f7]
Former-commit-id: e73a0de182
Former-commit-id: 670fb899a5
 2014-06-16 08:57:12 -05:00
Nate Jensen
c11968887a Merge "Issue #2903 changed collaboration jaxb xml to be base64 encoded" into omaha_14.3.1 
Former-commit-id: ed36453f09 [formerly eddc8f373a [formerly c2aa87470d] [formerly ed36453f09 [formerly 93f63c0d42941001e4d59a4840df5e5b525592bf]]]
Former-commit-id: eddc8f373a [formerly c2aa87470d]
Former-commit-id: eddc8f373a
Former-commit-id: 8ce9a5e5b8
 2014-06-16 08:31:30 -05:00
Steve Harris
eece76ad05 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: e1c8ad2611 [formerly 97843cf58e [formerly 9213369739] [formerly e1c8ad2611 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]]
Former-commit-id: 97843cf58e [formerly 9213369739]
Former-commit-id: 97843cf58e
Former-commit-id: 4d724b6474
 2014-06-16 08:19:12 -05:00
Steve Harris
0d9eab4572 Merge branch 'master_14.3.1' (14.3.1-10,11) into omaha_14.3.1 
Former-commit-id: 6c82cc5c3d [formerly 0c3dcb77d5 [formerly 1d2b8aeb7b] [formerly 6c82cc5c3d [formerly 4041e8afbb4bf1c0c416624140d74d27e963f9c8]]]
Former-commit-id: 0c3dcb77d5 [formerly 1d2b8aeb7b]
Former-commit-id: 0c3dcb77d5
Former-commit-id: e67900933d
 2014-06-16 07:49:58 -05:00
Greg Armendariz
90bcc3e3b0 Omaha #3247 - Update qpid dependency 
Former-commit-id: 70104bc9aa [formerly c14107d4cf [formerly db4e94b713] [formerly 70104bc9aa [formerly 9a6a0c9941aaa9b49da7329cccb7e05456ad514c]]]
Former-commit-id: c14107d4cf [formerly db4e94b713]
Former-commit-id: c14107d4cf
Former-commit-id: 65ced96c6b
 2014-06-14 08:13:14 -05:00
Ben Steffensmeier
708dad6bec Omaha #3265 Fix potential NPE in D2D time matching. 
Former-commit-id: 29b423645e [formerly 9caf60a551 [formerly 81fbf3b697] [formerly 29b423645e [formerly 9fea363e4fd21f2e9dc06b9450b71eb174dd0a29]]]
Former-commit-id: 9caf60a551 [formerly 81fbf3b697]
Former-commit-id: 9caf60a551
Former-commit-id: 0545a079a0
 2014-06-13 16:58:35 -05:00
Ben Steffensmeier
7fffec8033 Omaha #3163 Fix NPE when styleless strings are sent to 14.3 
Former-commit-id: 7245544e1f [formerly d2997f9fc0 [formerly 1f8f612d3a] [formerly 7245544e1f [formerly 3c1dd0e7daea7149a02b1a5e2be1a0db27e662d5]]]
Former-commit-id: d2997f9fc0 [formerly 1f8f612d3a]
Former-commit-id: d2997f9fc0
Former-commit-id: 4080f9b50b
 2014-06-13 16:49:25 -05:00