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

6095 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nate Jensen
ea655624cf Merge "Omaha #3214 added pulse and cloud flash rendering to cave" into omaha_14.4.1 
Former-commit-id: 98d3feb47d [formerly 3971e05c4c] [formerly 644fdf50c7] [formerly caf278ca5c [formerly 644fdf50c7 [formerly 741f2710372a713c53e70602395bf7c54fd17cdf]]]
Former-commit-id: caf278ca5c
Former-commit-id: cee67a5af8128d47aedf5bde10f3d741e8e63f17 [formerly 977a3818f1]
Former-commit-id: ad63e5b322
 2014-06-19 13:42:06 -05:00
Nate Jensen
e3e2820ece Omaha #3255 fix cave install of data delivery 
Change-Id: I06820560fd6b18c4886c0b3bef993e6830037b4e

Former-commit-id: 223f082f95 [formerly 76658aa485] [formerly eff82573df] [formerly f01e19946c [formerly eff82573df [formerly bc22cda0a2bcdb550ad4d57a9be522336d4bc633]]]
Former-commit-id: f01e19946c
Former-commit-id: aaeef7e32fd5cb96d71ac13510b3bd85842ace77 [formerly cb5d6fe187]
Former-commit-id: 6990acc1a7
 2014-06-19 13:15:40 -05:00
Brian Clements
fa919b9d2d Omaha #3214 added pulse and cloud flash rendering to cave 
Change-Id: Ibb842c0088b959e9ffc88c4db51f4c1bcc77d3ce

Former-commit-id: 24e406cbf2 [formerly 6345119f9b] [formerly 7dd90e6f85] [formerly a18069809a [formerly 7dd90e6f85 [formerly 136bb5feca753f83f53d9d1e9381061853edc402]]]
Former-commit-id: a18069809a
Former-commit-id: 150445682f7d66379f3836756c6b255b6676574a [formerly 6d5cbf29a5]
Former-commit-id: bd2288e066
 2014-06-19 12:50:56 -05:00
Nate Jensen
531aaa9457 Merge "Omaha #3226 fixed lightning decrypt validation, added initialization vector" into omaha_14.4.1 
Former-commit-id: a86a4df08e [formerly 472e6ec591] [formerly 557aa84227] [formerly 3f5c895d64 [formerly 557aa84227 [formerly f829356f22771dbcb408da598bfe80b11cbd8de9]]]
Former-commit-id: 3f5c895d64
Former-commit-id: 3d41ec61979a0b7de39d81c2453d16e995203dbc [formerly 920ec92736]
Former-commit-id: 31e4d9573f
 2014-06-19 12:14:58 -05:00
Benjamin Phillippe
7c64bf3134 Omaha #3255 Removed security plugin from ebxml common plugin to fix build 
Former-commit-id: 245703cb95 [formerly 44c5a9efe8] [formerly df37c55132] [formerly 2c646cf054 [formerly df37c55132 [formerly ee89581aeb3d2f640656f37c2e4118a78dee5ca0]]]
Former-commit-id: 2c646cf054
Former-commit-id: 798b5a7643d8bddf2a87a044aefe0243bfcec552 [formerly f1d3019bf0]
Former-commit-id: 4b480fa686
 2014-06-19 11:03:04 -05:00
Nate Jensen
77bbd44efb Merge "Omaha #3255 Remove cxf from cave feature to fix build" into omaha_14.4.1 
Former-commit-id: e81d51e479 [formerly c19f10ddd4] [formerly 66cb3d5f03] [formerly 27df878d86 [formerly 66cb3d5f03 [formerly 73c71e83588237e0a39d173c648f68a8e35bf119]]]
Former-commit-id: 27df878d86
Former-commit-id: 26eea25caacb498a572fd8a0f793d12b6a137b66 [formerly 918e5664bb]
Former-commit-id: d34ee39b1c
 2014-06-19 10:59:35 -05:00
Benjamin Phillippe
1d99894de0 Omaha #3255 Remove cxf from cave feature to fix build 
Former-commit-id: f3d556e3c2 [formerly 8428c676d7] [formerly 8d2605199e] [formerly fc024e6d4c [formerly 8d2605199e [formerly b6f01bfe3f45ab4c3299879db44763994f7f8222]]]
Former-commit-id: fc024e6d4c
Former-commit-id: 53d95d9a44a317d6a6005cabe66d51027d43c501 [formerly a90b1891b1]
Former-commit-id: d9298ddd4f
 2014-06-19 10:58:11 -05:00
Nate Jensen
0c618793e8 Merge "Omaha #2061 Fix recco." into omaha_14.4.1 
Former-commit-id: 8326b63fb2 [formerly d461865ffa] [formerly 95d705424c] [formerly 505cef31a6 [formerly 95d705424c [formerly 944598e429d2e4e01fceb0081991d83812055e3f]]]
Former-commit-id: 505cef31a6
Former-commit-id: a2214e58d03296fc1b2363c9d3060e2778c413f9 [formerly 6779d5c62a]
Former-commit-id: db7132a68d
 2014-06-19 10:52:46 -05:00
Nate Jensen
fb6d98a827 Merge "Omaha #3242 clean up more graphs" into omaha_14.4.1 
Former-commit-id: e2ddb7ce2c [formerly 870b7964b4] [formerly 9a459f2da7] [formerly a3fe508711 [formerly 9a459f2da7 [formerly 9f08e582b7eaf37741bbcee83692b9efe2859ea1]]]
Former-commit-id: a3fe508711
Former-commit-id: c3655b3c3bbd49d16f20e8c5849c49e98e3c9332 [formerly 836fa28a5d]
Former-commit-id: 2586401aa0
 2014-06-19 10:52:28 -05:00
Ben Steffensmeier
a6d9c76b84 Omaha #2061 Fix recco. 
Former-commit-id: 16024ca33a [formerly 6c3a3cc707] [formerly d953e65ac9] [formerly 135452a593 [formerly d953e65ac9 [formerly 16f0ae623de79d7a46573f2ec3833403d6cfd79f]]]
Former-commit-id: 135452a593
Former-commit-id: b3b00238a84189dd28ad3c7d3bb7c9dc793b75d5 [formerly 8613e5b11c]
Former-commit-id: 961a8402cc
 2014-06-19 10:46:29 -05:00
Brian Clements
a228a4490c Omaha #3226 fixed lightning decrypt validation, added initialization vector 
Change-Id: I8c72ef66f3f65a5bb1c3fdf8a2dd391c0cb5c554

Former-commit-id: 0f2fde3d29 [formerly 9064c50f01] [formerly ea6dd32169741d6df16b3dc4da15c989e1887031 [formerly da6eea7f57]] [formerly 36f8207246 [formerly da6eea7f57 [formerly 38a729b7d5b42ac60004473a4c875b5171a93569]]]
Former-commit-id: 36f8207246
Former-commit-id: 2c3c9a4018b4c62754a3d190903cf70fc8bbdbb8 [formerly bb69af4aef]
Former-commit-id: b5bc5cf85b
 2014-06-19 10:32:05 -05:00
Nate Jensen
eaee6c2bd5 Merge "Omaha #2061 Remove another reference to IDecoderGettable." into omaha_14.4.1 
Former-commit-id: 4df0dc8ff5 [formerly 67d6e9ce3b] [formerly 17554ba5c9] [formerly 5d209448da [formerly 17554ba5c9 [formerly 5741f0c527a75700bb0f745bbbdaf95929607e9d]]]
Former-commit-id: 5d209448da
Former-commit-id: 86e6cc1e3dc486f66c60da8d6a7d255ed3907624 [formerly 413ac17101]
Former-commit-id: 44b52b1328
 2014-06-19 10:12:18 -05:00
Greg Armendariz
c8f98b8bbc Omaha #3299 - Fix qpid dependency 
Former-commit-id: 261677faf9 [formerly 74500b05fc] [formerly 9d9ba5a78f] [formerly 9d1630a617 [formerly 9d9ba5a78f [formerly d292734da643f003d9d04e03b32727bf9c007443]]]
Former-commit-id: 9d1630a617
Former-commit-id: 916998cd8ec9d98a002702ddcef3487d8aa30f5c [formerly 58d09cc3ec]
Former-commit-id: 4802ac344e
 2014-06-19 09:56:10 -05:00
Nate Jensen
c51604ab51 Omaha #3242 clean up more graphs 
Change-Id: I2440877381afc684cb2a3b02cbdbe36905643de4

Former-commit-id: 069075ddd5 [formerly 9e317cb9bc] [formerly aca7b46243] [formerly 7bb2aebd59 [formerly aca7b46243 [formerly 667817cf9473889f8c5cc39dd71814f1181a3805]]]
Former-commit-id: 7bb2aebd59
Former-commit-id: 84a9e26ecbb53efc2328e7fde0e60f1333a43b8c [formerly 33f36374d0]
Former-commit-id: 88607607d7
 2014-06-18 18:23:36 -05:00
Nate Jensen
5d9ae95eef Merge "Omaha #3242 thread safety for inset map" into omaha_14.4.1 
Former-commit-id: c882f1c656 [formerly a83159ff6a] [formerly cc71d3fd6b5b97c8a606e8e2954515c7e89933df [formerly 55bd088ce5]] [formerly 835b65b7b8 [formerly 55bd088ce5 [formerly 43684d4c0fe8f4b79ef384c08d01d2bdd51990e6]]]
Former-commit-id: 835b65b7b8
Former-commit-id: c6da1d23d2f9ba33ddf3cf37457b5df999bf3988 [formerly 19383d86f2]
Former-commit-id: 135656f5f5
 2014-06-18 17:17:17 -05:00
Nate Jensen
3d16b84722 Merge "Omaha #3242 support ensemble id in time series legends" into omaha_14.4.1 
Former-commit-id: 679c3cfc12 [formerly 393718bf41] [formerly f0e0866155] [formerly fbd7e64fe2 [formerly f0e0866155 [formerly 84257c99914950f412f1e3d8c12b691fb428086f]]]
Former-commit-id: fbd7e64fe2
Former-commit-id: 6d0e35fba0917f975619a1a8805cbfa5f670d0e2 [formerly 098712e6a0]
Former-commit-id: 9e8f46a84c
 2014-06-18 17:17:04 -05:00
Nate Jensen
e347e9e36c 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: 9d943b869c [formerly 43a6ca22ac] [formerly 0db147238d] [formerly 9a76fd4db0 [formerly 0db147238d [formerly 968613aaa91648a8e860eff88293744ddc00464c]]]
Former-commit-id: 9a76fd4db0
Former-commit-id: f32ac3c9c72d0e0fc52e6736409463ad91c44f4d [formerly 7867dc1ff6]
Former-commit-id: 2e569fea17
 2014-06-18 17:07:19 -05:00
Nate Jensen
0c860e471f Omaha #3242 thread safety for inset map 
Change-Id: I358dfcb211444407095cd86657dee8ad522b5857

Former-commit-id: 63adaa42b1 [formerly 33f858e951] [formerly 9b98b63bb5] [formerly 30e76a1fd5 [formerly 9b98b63bb5 [formerly d06eedeefc7997f6c881cf267c7f24979afbd9d7]]]
Former-commit-id: 30e76a1fd5
Former-commit-id: ea79f4a272486d1d69b92addc8307d1d7ed9e5ed [formerly a32552846d]
Former-commit-id: 40ca9ab166
 2014-06-18 17:02:10 -05:00
Nate Jensen
2e2924f4fd 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: 718c6f8901 [formerly b6ba8c0a3d] [formerly a18fa3f026] [formerly 3ba4931eee [formerly a18fa3f026 [formerly 7999e026e8ff02ccb0f155af8770b0d8aac43339]]]
Former-commit-id: 3ba4931eee
Former-commit-id: af8c63a52813c2cc6ddb41be88909261f11b23d3 [formerly a990471021]
Former-commit-id: 51e5563415
 2014-06-18 16:48:48 -05:00
Nate Jensen
fdbcea1bdb Omaha #3242 fix error if user zooms on cross section before it's loaded 
Change-Id: I9143840a5074e4e5c9995c94cb21686598d79830

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

Former-commit-id: 9fad6c4712 [formerly 73082de461] [formerly 1a8995fc2d] [formerly e10a73c17b [formerly 1a8995fc2d [formerly 453c1eecf4f08203b4c6e2a74ad5dc366d85d359]]]
Former-commit-id: e10a73c17b
Former-commit-id: f01e86a5e49651bbc7ef488fdb5b254269b6d87f [formerly a575c57ecc]
Former-commit-id: d6f84d8281
 2014-06-18 15:37:14 -05:00
Benjamin Phillippe
76421f9bde Omaha #3255 Fix build 
Former-commit-id: ce6d87cdcb [formerly ebecdaeb36] [formerly 3864eb622e] [formerly bc9e7f1cb3 [formerly 3864eb622e [formerly cd985e372ebdd705e1e93c4760fc02f229ddfddd]]]
Former-commit-id: bc9e7f1cb3
Former-commit-id: 0385397c5ef091ba1f2c7c324cb0ffda856f0fef [formerly 4bb4c753ba]
Former-commit-id: 22b5114802
 2014-06-18 14:03:23 -05:00
Benjamin Phillippe
ffafec5ac0 Omaha #3255 Fixing Build 
Former-commit-id: 2451e01f8f [formerly a50a8e79a1] [formerly 621a3f1a5c] [formerly 7e7cecceea [formerly 621a3f1a5c [formerly a2a18d6f4a9f536172c264eeeee3ff51e225981f]]]
Former-commit-id: 7e7cecceea
Former-commit-id: bcbd7962ff3548603674df96d58b08927d440cb9 [formerly f6dc8523d7]
Former-commit-id: d59ea2591d
 2014-06-18 13:57:27 -05:00
Nate Jensen
bca37cebb8 Merge "Omaha #3255 Dependency cleanup" into omaha_14.4.1 
Former-commit-id: 45f7c49885 [formerly 0167a89312] [formerly 042b69ba9a] [formerly 9fd4e4a8d9 [formerly 042b69ba9a [formerly b209ae6772fe33ca73a130468c4c314f86ffeba5]]]
Former-commit-id: 9fd4e4a8d9
Former-commit-id: 96fb83a3888e8fb411862a3d0ec5e5d9a158e381 [formerly 806b3b1490]
Former-commit-id: fdebae41d5
 2014-06-18 12:14:45 -05:00
Ben Steffensmeier
67f6072608 Omaha #2061 Remove another reference to IDecoderGettable. 
Former-commit-id: 6f80f2f865 [formerly a55d42d479] [formerly cc72f9d983] [formerly 7b356e8ce0 [formerly cc72f9d983 [formerly bdca92f18fa4a7348dd82d9f2348583398dd5c30]]]
Former-commit-id: 7b356e8ce0
Former-commit-id: c81ebf9c4135610e3587b87575c3e64c5dcdd557 [formerly 49fc12968f]
Former-commit-id: b01f99e5f2
 2014-06-18 12:12:01 -05:00
Nate Jensen
7e6663b6ea Merge "Omaha #3274 fix generation of viz .ini files" into omaha_14.4.1 
Former-commit-id: 0b6265a9b5 [formerly 079828ecce] [formerly b3e73d78cc] [formerly 32bc3e4056 [formerly b3e73d78cc [formerly 5d378ca9529b48bd0a1422aec3263310f8350161]]]
Former-commit-id: 32bc3e4056
Former-commit-id: 37b222ad0912eced1456578902b2057597517555 [formerly c59136990b]
Former-commit-id: b6c7e0dfd2
 2014-06-18 11:11:34 -05:00
Nate Jensen
01cc17d563 Omaha #3274 fix generation of viz .ini files 
Change-Id: I5ca9b02310cd068df5ee30acf47396070142dfc7

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

Former-commit-id: 50e9bbd139 [formerly b41f79658f] [formerly 270caaadde] [formerly c2ed8a39d1 [formerly 270caaadde [formerly dbac62df979f23402594dc6439b53e7884ea1bd1]]]
Former-commit-id: c2ed8a39d1
Former-commit-id: 87fc63da2c86cba2854e4d6d952a3ce6827726f2 [formerly 447fb0572a]
Former-commit-id: 38abcb36f5
 2014-06-18 09:54:40 -05:00
Steve Harris
27d4a11026 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: 3e2eeedc29 [formerly 9de49b59ea] [formerly cc7e6bc52a] [formerly 676948e239 [formerly cc7e6bc52a [formerly da50f581c90ea0cca5f43c45c44cb8ac045a6c8c]]]
Former-commit-id: 676948e239
Former-commit-id: 1a57d0d34838b0e6e0a1f655b3563f62c2132b16 [formerly 18b2a1df08]
Former-commit-id: 586f563839
 2014-06-18 08:52:25 -05:00
Nate Jensen
c20b62489e Merge "Omaha #3078 collaboration shared display data over private chat" into omaha_14.4.1 
Former-commit-id: 7299d9ccb8 [formerly 344a6b80ef] [formerly a2783be56a] [formerly 764f977bf6 [formerly a2783be56a [formerly 4468390aaf89456e93b45fca20aeca7fb96d8c12]]]
Former-commit-id: 764f977bf6
Former-commit-id: f149b9701352b48ef9b7ddf5ee4f2468a867cf83 [formerly bc5cedb1c8]
Former-commit-id: 686f6f67a0
 2014-06-17 18:09:33 -05:00
Nate Jensen
d6612e027e Merge "Omaha #3245 fix GFE starting without a cave data" into omaha_14.4.1 
Former-commit-id: b0d4a3006b [formerly bb60b170e8] [formerly dcab909b4b] [formerly 7fc256d076 [formerly dcab909b4b [formerly c632bf24ee15cc85da9d7e7fb0a295912bf06b78]]]
Former-commit-id: 7fc256d076
Former-commit-id: c01a747187af151b3885060aa9f39b3a286b4c75 [formerly a499624f5f]
Former-commit-id: 1f9f0ba7f3
 2014-06-17 17:01:46 -05:00
Brian Clements
424e910953 Issue #2903 prevent shared display crash from missing point style enum value 
Change-Id: I9d3faccba56c2832c5dcc185c6c20bcce396b173

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

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

Former-commit-id: bb4ff41368 [formerly b518cb2418] [formerly 9a427606ae] [formerly add8286d52 [formerly 9a427606ae [formerly a51847aff197f805a4e48c9ecdb0c16f874e6a78]]]
Former-commit-id: add8286d52
Former-commit-id: 7d4355df36b7267b7d8e5f8b48c9fb8504d622ae [formerly 06b7415cec]
Former-commit-id: 13bf7e0793
 2014-06-17 14:32:17 -05:00
Nate Jensen
552727890e 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: 1dcfbab3fd [formerly bd2ef07395] [formerly d8dc6eceef] [formerly acd7620d7a [formerly d8dc6eceef [formerly 6efd831efcc5372c7e7bfd52265d13de382407ee]]]
Former-commit-id: acd7620d7a
Former-commit-id: 189ef3ff5243b921f4ff74fce6202acf120c0e31 [formerly 485aced54c]
Former-commit-id: fe52a8f7f8
 2014-06-17 14:21:55 -05:00
Ron Anderson
25187d7d4e Merge "Omaha #3274 switch viz to G1 garbage collector" into omaha_14.4.1 
Former-commit-id: 39bf0a24c0 [formerly b0a7be6203] [formerly d5c2170a20] [formerly 855b4ad7c1 [formerly d5c2170a20 [formerly a971a5b1d27611c8b3a9a47b76efafa0c2c7a9fc]]]
Former-commit-id: 855b4ad7c1
Former-commit-id: 0861ed308e148cbeaaa53c965d244b1f6b419173 [formerly 79c6182cc9]
Former-commit-id: 32e707294a
 2014-06-17 13:54:11 -05:00
Ron Anderson
040334beb8 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: 8e920811f3 [formerly 404098d861] [formerly b7843361f6] [formerly 1a8ccd0181 [formerly b7843361f6 [formerly 0cf0e93eabd440cf0ca3e88ac36c62b3309b6527]]]
Former-commit-id: 1a8ccd0181
Former-commit-id: a5d0b7d3786feedc34e175c2fc44d93cb8d20dac [formerly e31eabe77b]
Former-commit-id: ed318889de
 2014-06-17 13:46:38 -05:00
Brian Clements
8487f6388c Omaha #3078 added private chat to collaboration 
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae

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

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

Former-commit-id: f38f9fae51 [formerly 8205f7cd56] [formerly e93c5642291bd6c8ebb4fc3528e55bf08184500d [formerly b6a2bf0ae4]] [formerly 84e3f967d9 [formerly b6a2bf0ae4 [formerly baab2ea12e1117446295ae60bc06228eb6139895]]]
Former-commit-id: 84e3f967d9
Former-commit-id: d0ae674bb4714971796f2565a9a4ddf679e2c503 [formerly 5436efb886]
Former-commit-id: 4dc81aabfa
 2014-06-17 09:26:24 -05:00
Nate Jensen
905c5ae0a7 Omaha #3255 attempt to fix build 
Change-Id: I8b21eaebaa60a7051ccbc9d12d33df742c471f25

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

Former-commit-id: 382fd79fb5 [formerly 4fd29b211a] [formerly a8bae916f3] [formerly c65c392d63 [formerly a8bae916f3 [formerly 579cef6ab063bae1df0cfe85411d174dc75b08bd]]]
Former-commit-id: c65c392d63
Former-commit-id: 1fa5bdfe6b51a46f408a1d99d7fd0f940fe1c056 [formerly 9cd933cc7b]
Former-commit-id: 47907b7dcd
 2014-06-17 07:40:18 -05:00
Ben Steffensmeier
10196f93a0 Omaha #2061 Update ncep copies of radar resources. 
Former-commit-id: 7e5eb9d3ae [formerly 8d521a40d0] [formerly 14b5c0d792] [formerly 8064a74866 [formerly 14b5c0d792 [formerly 64b5e484c0dd8409ab0b791763c31681c94a38d3]]]
Former-commit-id: 8064a74866
Former-commit-id: 5a7f92f5da740c9b5d30a7e319cbf87d2caa8a08 [formerly 50a1fd7cf9]
Former-commit-id: 7fc201d3e8
 2014-06-16 10:56:40 -05:00
Nate Jensen
3e520231e7 Merge "Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings." into omaha_14.4.1 
Former-commit-id: 40c2a6c486 [formerly 95b2e262a0] [formerly 14bb055cd2793d554dd7daf943adf12f94694871 [formerly b1acd1709a]] [formerly 9b7ed95e6b [formerly b1acd1709a [formerly 2ee54c1f78136332f1cd2c40da0c2e7953510e7f]]]
Former-commit-id: 9b7ed95e6b
Former-commit-id: 3ab762d979230aedd7fdd4120f726266218ba049 [formerly 521065548d]
Former-commit-id: 99b46cfbcf
 2014-06-16 09:26:30 -05:00
Nate Jensen
8aeda0f379 Merge "Omaha #3265 Fix potential NPE in D2D time matching." into omaha_14.4.1 
Former-commit-id: edfb0ca7d5 [formerly c2766190a4] [formerly 5fad6501a7] [formerly b3df7745d4 [formerly 5fad6501a7 [formerly 83d1a4b6e69e3fe1bb350beba4f36eb3bf34e05d]]]
Former-commit-id: b3df7745d4
Former-commit-id: 90632f07aa8ff3bf10b73ad2f82c2aaa931c78b0 [formerly 752fe50104]
Former-commit-id: ca06c42305
 2014-06-16 09:00:47 -05:00
Nate Jensen
fc4e336995 Merge "Omaha #3163 Fix NPE when styleless strings are sent to 14.3" into omaha_14.4.1 
Former-commit-id: f29aea8b46 [formerly 4544d7d3e0] [formerly 181a87e72d] [formerly 5908a4501a [formerly 181a87e72d [formerly 34250721f97f05be61e9e4e8b6f71758347a9f60]]]
Former-commit-id: 5908a4501a
Former-commit-id: fcdbaaf51981d91c6263b4126925c93995dd6a35 [formerly 442a3d9683]
Former-commit-id: 8aa1e4aacb
 2014-06-16 09:00:39 -05:00
Greg Armendariz
474d384f97 Merge "Omaha #3247 - Update qpid dependency" into omaha_14.4.1 
Former-commit-id: 670fb899a5 [formerly e73a0de182] [formerly faebbc13f7] [formerly 8c568a223e [formerly faebbc13f7 [formerly 2484a3407392f64b51b93bd3a4dab04194debea5]]]
Former-commit-id: 8c568a223e
Former-commit-id: 06515ca3b86636dd0c3b90da3ce9e562cfb0a30f [formerly 5c8c3ba6b3]
Former-commit-id: 5fd5c7f8ff
 2014-06-16 08:57:12 -05:00
Nate Jensen
a7de352bc1 Merge "Issue #2903 changed collaboration jaxb xml to be base64 encoded" into omaha_14.3.1 
Former-commit-id: 8ce9a5e5b8 [formerly eddc8f373a] [formerly c2aa87470d] [formerly ed36453f09 [formerly c2aa87470d [formerly 93f63c0d42941001e4d59a4840df5e5b525592bf]]]
Former-commit-id: ed36453f09
Former-commit-id: b555e7ee30d9051470c8a8d81f5bb009419c6e82 [formerly ef61539a8a]
Former-commit-id: 50715cc012
 2014-06-16 08:31:30 -05:00