Steve Harris
|
7e7529e482
|
CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: 869235c02a [formerly 16f5ff0979] [formerly b84dda5930] [formerly 869235c02a [formerly 16f5ff0979] [formerly b84dda5930] [formerly 419c5f4aba [formerly b84dda5930 [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]]
Former-commit-id: 419c5f4aba
Former-commit-id: bab435f286 [formerly af06c5a890] [formerly dd639a780b77ef5a2f827ee961c20e9db23d2d31 [formerly 66d30e59a3]]
Former-commit-id: 27bd7f3ff5ce8e46cd91569a3f0cf62fa9127e53 [formerly 935542914d]
Former-commit-id: 196f53e609
|
2014-06-20 14:01:55 -04:00 |
|
Brian Clements
|
3ef4cf722a
|
Omaha #3281 peer2peer chat view improvements
bounced chat messages now result in error messages in window
fixed view secondary id bug with userids (removed resource from key)
Change-Id: I76a68bf290b0c5205361bc6c78fda99336d7c62d
Former-commit-id: c2ac40caec [formerly f053e9b084] [formerly 9d626a97e5] [formerly c2ac40caec [formerly f053e9b084] [formerly 9d626a97e5] [formerly 93a1ee71c4 [formerly 9d626a97e5 [formerly a31b7f213081f384bd23d53a431ce53593254c25]]]]
Former-commit-id: 93a1ee71c4
Former-commit-id: a5f70b0e92 [formerly 3eb4cd513c] [formerly 19045905bf3f712c73a4de48818e485b9aaeb892 [formerly a9827ef8e8]]
Former-commit-id: 9ad39c4d0c064523e2d3ba343082d0567e667e2a [formerly 7060fe3fba]
Former-commit-id: bb58783ca4
|
2014-06-20 09:04:15 -05:00 |
|
Brian Clements
|
ad5e56f89a
|
Omaha #3281 collaboration views persist between perspectives
fixed bug that prevented re-opening collaboration after views were closed
Change-Id: I62651d9d5fe52defe3f4f37ee97b4d824cb974e3
Former-commit-id: 27f7b754a3 [formerly 21fca2e662] [formerly 9aa5a87c4b] [formerly 27f7b754a3 [formerly 21fca2e662] [formerly 9aa5a87c4b] [formerly fd95df3bc0 [formerly 9aa5a87c4b [formerly b84f7571415871f2983b913cf816ed227b24bbac]]]]
Former-commit-id: fd95df3bc0
Former-commit-id: 1f176ef9b9 [formerly 74c62e0bf9] [formerly 432bcaa1164a2f10b560fb73e9f366e8663ada6d [formerly 795fa49ced]]
Former-commit-id: c5974f5b42889bc8aca6c62470535a1217c6644d [formerly 5560b12a5a]
Former-commit-id: a8e31ffa21
|
2014-06-20 08:53:54 -05:00 |
|
Nate Jensen
|
933a80d387
|
Omaha #3245 remove -vm argument
Change-Id: Ic4170cc85683121845013380fb2780b922e5fc13
Former-commit-id: 37d6f292f1 [formerly 02372893b6] [formerly 123b22d90a] [formerly 37d6f292f1 [formerly 02372893b6] [formerly 123b22d90a] [formerly d60d2b5caf [formerly 123b22d90a [formerly 003c2d49ecc20cfae2cdefb14119e7d0b143e4c6]]]]
Former-commit-id: d60d2b5caf
Former-commit-id: 08636a5f5b [formerly 98e2cb8d62] [formerly 2cf929ecb091082bc5cd97818befbad8fe1ad67e [formerly ef20c3192e]]
Former-commit-id: 61c2610d9a6d317ba19e944b9cc1dc670350da6f [formerly 7af79aca86]
Former-commit-id: cc90e21628
|
2014-06-19 14:44:24 -05:00 |
|
Nate Jensen
|
9814cdfe5c
|
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 98d3feb47d [formerly 3971e05c4c] [formerly 644fdf50c7] [formerly caf278ca5c [formerly 644fdf50c7 [formerly 741f2710372a713c53e70602395bf7c54fd17cdf]]]]
Former-commit-id: caf278ca5c
Former-commit-id: ea655624cf [formerly ad63e5b322] [formerly cee67a5af8128d47aedf5bde10f3d741e8e63f17 [formerly 977a3818f1]]
Former-commit-id: 7f8cb1ec2efab28af890e38c8b59fcde4b03cbf0 [formerly d67339b3a9]
Former-commit-id: 1d44a9f517
|
2014-06-19 13:42:06 -05:00 |
|
Nate Jensen
|
8e64be017c
|
Omaha #3255 fix cave install of data delivery
Change-Id: I06820560fd6b18c4886c0b3bef993e6830037b4e
Former-commit-id: 223f082f95 [formerly 76658aa485] [formerly eff82573df] [formerly 223f082f95 [formerly 76658aa485] [formerly eff82573df] [formerly f01e19946c [formerly eff82573df [formerly bc22cda0a2bcdb550ad4d57a9be522336d4bc633]]]]
Former-commit-id: f01e19946c
Former-commit-id: e3e2820ece [formerly 6990acc1a7] [formerly aaeef7e32fd5cb96d71ac13510b3bd85842ace77 [formerly cb5d6fe187]]
Former-commit-id: f362bdb91040427ba1f7c4477d556f059fa6ab13 [formerly 43cdc7fccb]
Former-commit-id: 255d1859f4
|
2014-06-19 13:15:40 -05:00 |
|
Brian Clements
|
fe445262e9
|
Omaha #3214 added pulse and cloud flash rendering to cave
Change-Id: Ibb842c0088b959e9ffc88c4db51f4c1bcc77d3ce
Former-commit-id: 24e406cbf2 [formerly 6345119f9b] [formerly 7dd90e6f85] [formerly 24e406cbf2 [formerly 6345119f9b] [formerly 7dd90e6f85] [formerly a18069809a [formerly 7dd90e6f85 [formerly 136bb5feca753f83f53d9d1e9381061853edc402]]]]
Former-commit-id: a18069809a
Former-commit-id: fa919b9d2d [formerly bd2288e066] [formerly 150445682f7d66379f3836756c6b255b6676574a [formerly 6d5cbf29a5]]
Former-commit-id: 779b58b592bf4d7a21c61fa23bb33f937bcf3653 [formerly 74d4ebf071]
Former-commit-id: cadb1091fb
|
2014-06-19 12:50:56 -05:00 |
|
Nate Jensen
|
9df3186751
|
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 e81d51e479 [formerly c19f10ddd4] [formerly 66cb3d5f03] [formerly 27df878d86 [formerly 66cb3d5f03 [formerly 73c71e83588237e0a39d173c648f68a8e35bf119]]]]
Former-commit-id: 27df878d86
Former-commit-id: 77bbd44efb [formerly d34ee39b1c] [formerly 26eea25caacb498a572fd8a0f793d12b6a137b66 [formerly 918e5664bb]]
Former-commit-id: 69d382857883fa8401747d1738cf81affa7ac914 [formerly 9c0adc1c15]
Former-commit-id: 813921a97c
|
2014-06-19 10:59:35 -05:00 |
|
Benjamin Phillippe
|
74a1fcb570
|
Omaha #3255 Remove cxf from cave feature to fix build
Former-commit-id: f3d556e3c2 [formerly 8428c676d7] [formerly 8d2605199e] [formerly f3d556e3c2 [formerly 8428c676d7] [formerly 8d2605199e] [formerly fc024e6d4c [formerly 8d2605199e [formerly b6f01bfe3f45ab4c3299879db44763994f7f8222]]]]
Former-commit-id: fc024e6d4c
Former-commit-id: 1d99894de0 [formerly d9298ddd4f] [formerly 53d95d9a44a317d6a6005cabe66d51027d43c501 [formerly a90b1891b1]]
Former-commit-id: 39705b3f039f4e68c7b01d5ee6dfe00c10a1c975 [formerly fb3ea7760d]
Former-commit-id: 7dd8c59365
|
2014-06-19 10:58:11 -05:00 |
|
Nate Jensen
|
1de92d63db
|
Omaha #3242 clean up more graphs
Change-Id: I2440877381afc684cb2a3b02cbdbe36905643de4
Former-commit-id: 069075ddd5 [formerly 9e317cb9bc] [formerly aca7b46243] [formerly 069075ddd5 [formerly 9e317cb9bc] [formerly aca7b46243] [formerly 7bb2aebd59 [formerly aca7b46243 [formerly 667817cf9473889f8c5cc39dd71814f1181a3805]]]]
Former-commit-id: 7bb2aebd59
Former-commit-id: c51604ab51 [formerly 88607607d7] [formerly 84a9e26ecbb53efc2328e7fde0e60f1333a43b8c [formerly 33f36374d0]]
Former-commit-id: c2837f00418be01c56e2f95d6dde7dc8a6d8918f [formerly a1467e4361]
Former-commit-id: 89d67fbce7
|
2014-06-18 18:23:36 -05:00 |
|
Nate Jensen
|
475873c09f
|
Merge "Omaha #3242 thread safety for inset map" into omaha_14.4.1
Former-commit-id: c882f1c656 [formerly a83159ff6a] [formerly 55bd088ce5] [formerly c882f1c656 [formerly a83159ff6a] [formerly 55bd088ce5] [formerly 835b65b7b8 [formerly 55bd088ce5 [formerly 43684d4c0fe8f4b79ef384c08d01d2bdd51990e6]]]]
Former-commit-id: 835b65b7b8
Former-commit-id: 5d9ae95eef [formerly 135656f5f5] [formerly c6da1d23d2f9ba33ddf3cf37457b5df999bf3988 [formerly 19383d86f2]]
Former-commit-id: 2ea918cefa6ae8865fc49c46325d0570cb8c8cc8 [formerly c02a5a88eb]
Former-commit-id: da89b20f75
|
2014-06-18 17:17:17 -05:00 |
|
Nate Jensen
|
a2a669ec28
|
Merge "Omaha #3242 support ensemble id in time series legends" into omaha_14.4.1
Former-commit-id: 679c3cfc12 [formerly 393718bf41] [formerly f0e0866155] [formerly 679c3cfc12 [formerly 393718bf41] [formerly f0e0866155] [formerly fbd7e64fe2 [formerly f0e0866155 [formerly 84257c99914950f412f1e3d8c12b691fb428086f]]]]
Former-commit-id: fbd7e64fe2
Former-commit-id: 3d16b84722 [formerly 9e8f46a84c] [formerly 6d0e35fba0917f975619a1a8805cbfa5f670d0e2 [formerly 098712e6a0]]
Former-commit-id: ed9b319354c0e0b61c2055d8c8318160ffef8e63 [formerly ddae1dc541]
Former-commit-id: 76f8d24c33
|
2014-06-18 17:17:04 -05:00 |
|
Nate Jensen
|
cb615b0950
|
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 9d943b869c [formerly 43a6ca22ac] [formerly 0db147238d] [formerly 9a76fd4db0 [formerly 0db147238d [formerly 968613aaa91648a8e860eff88293744ddc00464c]]]]
Former-commit-id: 9a76fd4db0
Former-commit-id: e347e9e36c [formerly 2e569fea17] [formerly f32ac3c9c72d0e0fc52e6736409463ad91c44f4d [formerly 7867dc1ff6]]
Former-commit-id: 5542dc3b7f89c71b25c68dce8260d3e910908dbf [formerly a57ea807ea]
Former-commit-id: 697c53e6bb
|
2014-06-18 17:07:19 -05:00 |
|
Nate Jensen
|
ed208045de
|
Omaha #3242 thread safety for inset map
Change-Id: I358dfcb211444407095cd86657dee8ad522b5857
Former-commit-id: 63adaa42b1 [formerly 33f858e951] [formerly 9b98b63bb5] [formerly 63adaa42b1 [formerly 33f858e951] [formerly 9b98b63bb5] [formerly 30e76a1fd5 [formerly 9b98b63bb5 [formerly d06eedeefc7997f6c881cf267c7f24979afbd9d7]]]]
Former-commit-id: 30e76a1fd5
Former-commit-id: 0c860e471f [formerly 40ca9ab166] [formerly ea79f4a272486d1d69b92addc8307d1d7ed9e5ed [formerly a32552846d]]
Former-commit-id: 3bb0c0c96a44d482ae91801accf46bb09771fbb1 [formerly 3a7c95c110]
Former-commit-id: d68030a1cc
|
2014-06-18 17:02:10 -05:00 |
|
Nate Jensen
|
8656172f9d
|
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 718c6f8901 [formerly b6ba8c0a3d] [formerly a18fa3f026] [formerly 3ba4931eee [formerly a18fa3f026 [formerly 7999e026e8ff02ccb0f155af8770b0d8aac43339]]]]
Former-commit-id: 3ba4931eee
Former-commit-id: 2e2924f4fd [formerly 51e5563415] [formerly af8c63a52813c2cc6ddb41be88909261f11b23d3 [formerly a990471021]]
Former-commit-id: 1ca7a5ee0dea800016cec68819339db95a0eaa6b [formerly 4e673d8358]
Former-commit-id: e46c6a4ed4
|
2014-06-18 16:48:48 -05:00 |
|
Nate Jensen
|
29ee918f96
|
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 472b055826 [formerly aa579b85e7] [formerly 1add8fca08] [formerly 46c843f51a [formerly 1add8fca08 [formerly 4a7eebe03c9cd84702e6cda1258503da725a10bb]]]]
Former-commit-id: 46c843f51a
Former-commit-id: fdbcea1bdb [formerly 18ce2d6635] [formerly cd93d9300939601324d2584de65ffd6fbab2cdcf [formerly 32038939b3]]
Former-commit-id: 315c9436cd03e6546a75b9840e650727c88c9bbc [formerly 4c44afbf22]
Former-commit-id: c65c47c798
|
2014-06-18 16:37:49 -05:00 |
|
Nate Jensen
|
f943500410
|
Omaha #3242 support ensemble id in time series legends
Change-Id: I7f8435d274d3981e4871a5cf726bbf69e22a0d08
Former-commit-id: 9fad6c4712 [formerly 73082de461] [formerly 1a8995fc2d] [formerly 9fad6c4712 [formerly 73082de461] [formerly 1a8995fc2d] [formerly e10a73c17b [formerly 1a8995fc2d [formerly 453c1eecf4f08203b4c6e2a74ad5dc366d85d359]]]]
Former-commit-id: e10a73c17b
Former-commit-id: 7f3df290d5 [formerly d6f84d8281] [formerly f01e86a5e49651bbc7ef488fdb5b254269b6d87f [formerly a575c57ecc]]
Former-commit-id: 89d347029c66f9cb9c20aee6545ec2bc64fdc26f [formerly 1d244a4a95]
Former-commit-id: bf95e2a827
|
2014-06-18 15:37:14 -05:00 |
|
Benjamin Phillippe
|
58e89c4c2d
|
Omaha #3255 Fixing Build
Former-commit-id: 2451e01f8f [formerly a50a8e79a1] [formerly 621a3f1a5c] [formerly 2451e01f8f [formerly a50a8e79a1] [formerly 621a3f1a5c] [formerly 7e7cecceea [formerly 621a3f1a5c [formerly a2a18d6f4a9f536172c264eeeee3ff51e225981f]]]]
Former-commit-id: 7e7cecceea
Former-commit-id: ffafec5ac0 [formerly d59ea2591d] [formerly bcbd7962ff3548603674df96d58b08927d440cb9 [formerly f6dc8523d7]]
Former-commit-id: c6fd967a96a88e5d2d9ca63a8af9c512ac7df5ff [formerly 07c5831045]
Former-commit-id: 55e4811fe8
|
2014-06-18 13:57:27 -05:00 |
|
Nate Jensen
|
f42ee8c556
|
Merge "Omaha #3255 Dependency cleanup" into omaha_14.4.1
Former-commit-id: 45f7c49885 [formerly 0167a89312] [formerly 042b69ba9a] [formerly 45f7c49885 [formerly 0167a89312] [formerly 042b69ba9a] [formerly 9fd4e4a8d9 [formerly 042b69ba9a [formerly b209ae6772fe33ca73a130468c4c314f86ffeba5]]]]
Former-commit-id: 9fd4e4a8d9
Former-commit-id: bca37cebb8 [formerly fdebae41d5] [formerly 96fb83a3888e8fb411862a3d0ec5e5d9a158e381 [formerly 806b3b1490]]
Former-commit-id: 7e2e14dbe7ee12a875c49b82ed10d7c8831957ae [formerly 5d1cf81f99]
Former-commit-id: 2e803f21b3
|
2014-06-18 12:14:45 -05:00 |
|
Nate Jensen
|
aeda2c794b
|
Merge "Omaha #3274 fix generation of viz .ini files" into omaha_14.4.1
Former-commit-id: 0b6265a9b5 [formerly 079828ecce] [formerly b3e73d78cc] [formerly 0b6265a9b5 [formerly 079828ecce] [formerly b3e73d78cc] [formerly 32bc3e4056 [formerly b3e73d78cc [formerly 5d378ca9529b48bd0a1422aec3263310f8350161]]]]
Former-commit-id: 32bc3e4056
Former-commit-id: 7e6663b6ea [formerly b6c7e0dfd2] [formerly 37b222ad0912eced1456578902b2057597517555 [formerly c59136990b]]
Former-commit-id: fef4f9e799bf8cd902191ac7a1117a3023990c5d [formerly 7872e29f1b]
Former-commit-id: 86a57cc2c5
|
2014-06-18 11:11:34 -05:00 |
|
Nate Jensen
|
699ab5b707
|
Omaha #3274 fix generation of viz .ini files
Change-Id: I5ca9b02310cd068df5ee30acf47396070142dfc7
Former-commit-id: 68679fd1a5 [formerly f958ca8de2] [formerly 465a0fef71] [formerly 68679fd1a5 [formerly f958ca8de2] [formerly 465a0fef71] [formerly 17dc45e7ca [formerly 465a0fef71 [formerly dd628b80f7798bb66d3c54568b9549e66870ddec]]]]
Former-commit-id: 17dc45e7ca
Former-commit-id: 01cc17d563 [formerly fe17c9b8b9] [formerly 411a680a4d434801099ce173642a2327e3a87bab [formerly a9fc46a6fb]]
Former-commit-id: a985db7a3369f6d16bfd621324342acfe77dfc86 [formerly 4129bd518d]
Former-commit-id: 787b6d8a60
|
2014-06-18 10:03:17 -05:00 |
|
Benjamin Phillippe
|
9d5b1f9169
|
Omaha #3255 Dependency cleanup
Change-Id: Ic405d8f4fbe3f778d7e542529d566678c445647e
Former-commit-id: 50e9bbd139 [formerly b41f79658f] [formerly 270caaadde] [formerly 50e9bbd139 [formerly b41f79658f] [formerly 270caaadde] [formerly c2ed8a39d1 [formerly 270caaadde [formerly dbac62df979f23402594dc6439b53e7884ea1bd1]]]]
Former-commit-id: c2ed8a39d1
Former-commit-id: 3f3526805d [formerly 38abcb36f5] [formerly 87fc63da2c86cba2854e4d6d952a3ce6827726f2 [formerly 447fb0572a]]
Former-commit-id: 9769e5ad7b21ad1bc2054b28d45cb30c5672c3cf [formerly 5d908f2288]
Former-commit-id: a8d99c348d
|
2014-06-18 09:54:40 -05:00 |
|
Steve Harris
|
fca46f9f01
|
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 3e2eeedc29 [formerly 9de49b59ea] [formerly cc7e6bc52a] [formerly 676948e239 [formerly cc7e6bc52a [formerly da50f581c90ea0cca5f43c45c44cb8ac045a6c8c]]]]
Former-commit-id: 676948e239
Former-commit-id: 27d4a11026 [formerly 586f563839] [formerly 1a57d0d34838b0e6e0a1f655b3563f62c2132b16 [formerly 18b2a1df08]]
Former-commit-id: dc55036e5f98fad484f6203ac50fcba1e2ad81f9 [formerly 545d6da097]
Former-commit-id: a6d5652425
|
2014-06-18 08:52:25 -05:00 |
|
Brian.Dyke
|
71ca3ae180
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: e3dc97e246 [formerly be589ceb9b] [formerly 399c06820a] [formerly e3dc97e246 [formerly be589ceb9b] [formerly 399c06820a] [formerly 8ecdd9a192 [formerly 399c06820a [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]]]
Former-commit-id: 8ecdd9a192
Former-commit-id: f09000ec64 [formerly e28febcf27] [formerly 9723a25d830a41cf2e060dc218ad841643217c3e [formerly 9031f58d02]]
Former-commit-id: c6144f8a9f4e5c44b2c2c7442f0100f646622fba [formerly 3e10995d87]
Former-commit-id: b602d29456
|
2014-06-18 08:55:49 -04:00 |
|
Nate Jensen
|
4a7f8e9b7b
|
Merge "Omaha #3078 collaboration shared display data over private chat" into omaha_14.4.1
Former-commit-id: 7299d9ccb8 [formerly 344a6b80ef] [formerly a2783be56a] [formerly 7299d9ccb8 [formerly 344a6b80ef] [formerly a2783be56a] [formerly 764f977bf6 [formerly a2783be56a [formerly 4468390aaf89456e93b45fca20aeca7fb96d8c12]]]]
Former-commit-id: 764f977bf6
Former-commit-id: c20b62489e [formerly 686f6f67a0] [formerly f149b9701352b48ef9b7ddf5ee4f2468a867cf83 [formerly bc5cedb1c8]]
Former-commit-id: 3c5de44029141920975565b19978afbbb1d10a8d [formerly 7011f15929]
Former-commit-id: 3923c96927
|
2014-06-17 18:09:33 -05:00 |
|
Nate Jensen
|
f1b718d724
|
Merge "Omaha #3245 fix GFE starting without a cave data" into omaha_14.4.1
Former-commit-id: b0d4a3006b [formerly bb60b170e8] [formerly dcab909b4b] [formerly b0d4a3006b [formerly bb60b170e8] [formerly dcab909b4b] [formerly 7fc256d076 [formerly dcab909b4b [formerly c632bf24ee15cc85da9d7e7fb0a295912bf06b78]]]]
Former-commit-id: 7fc256d076
Former-commit-id: d6612e027e [formerly 1f9f0ba7f3] [formerly c01a747187af151b3885060aa9f39b3a286b4c75 [formerly a499624f5f]]
Former-commit-id: 3ab140c3f405da2a3bc7ce0d0cedbd531df23ed9 [formerly f94209e681]
Former-commit-id: f21b672114
|
2014-06-17 17:01:46 -05:00 |
|
Brian Clements
|
d75be4a64c
|
Issue #2903 prevent shared display crash from missing point style enum value
Change-Id: I9d3faccba56c2832c5dcc185c6c20bcce396b173
Former-commit-id: ccac7c3d47 [formerly b8a0a60df6] [formerly 9946f78241] [formerly ccac7c3d47 [formerly b8a0a60df6] [formerly 9946f78241] [formerly 5d03048fff [formerly 9946f78241 [formerly 5d298b39786d37aa365ccfe2c337214d1e46f1a9]]]]
Former-commit-id: 5d03048fff
Former-commit-id: 424e910953 [formerly dbe778cbe0] [formerly e21697c67a7f70581429d5de01d62bdd8589e8e9 [formerly 59d92634b0]]
Former-commit-id: 7a2a949eba2c4f80c7fff71719a70d5f4ae9e7ec [formerly 48e634b14a]
Former-commit-id: ed95461c36
|
2014-06-17 17:01:23 -05:00 |
|
Nate Jensen
|
efb7cf3eed
|
Omaha #3245 fix GFE starting without a cave data
Change-Id: I61e9766bccd099619bfedfd9a1e1121fe63120d7
Former-commit-id: 3828961fa0 [formerly 2ce0e5aee5] [formerly 19aa9dc96e] [formerly 3828961fa0 [formerly 2ce0e5aee5] [formerly 19aa9dc96e] [formerly 8ab7d86a8f [formerly 19aa9dc96e [formerly 539d497c5fc80efd5099e76a9e95a4709ace041d]]]]
Former-commit-id: 8ab7d86a8f
Former-commit-id: f9b14d08c5 [formerly 5129fee3e6] [formerly cdb1fa18b658fe4839af6b138e615f2a46f7a0db [formerly 451b265ce6]]
Former-commit-id: ebea420f2290075cc42ea3c5f473c33e49cfb16a [formerly e59c180fdc]
Former-commit-id: 11753fc2d3
|
2014-06-17 16:31:20 -05:00 |
|
Nate Jensen
|
c0b2dd778b
|
Merge "Omaha #3078 added private chat to collaboration" into omaha_14.4.1
Former-commit-id: 58a8a337d1 [formerly 12ef85f665] [formerly 7fb85a1acc] [formerly 58a8a337d1 [formerly 12ef85f665] [formerly 7fb85a1acc] [formerly c05ae83ea2 [formerly 7fb85a1acc [formerly 2c2b3891003076484539ef5fa7d6772b6336c635]]]]
Former-commit-id: c05ae83ea2
Former-commit-id: aef8534232 [formerly f925285131] [formerly b6c701624af051f3c2905f7c40c0e56fe9dae0d9 [formerly 0d71d5dc2b]]
Former-commit-id: 48a085bad44177220b99e6578db232d1c83cb36d [formerly 181da0bc6a]
Former-commit-id: aec31b09bc
|
2014-06-17 16:24:42 -05:00 |
|
Brian Clements
|
42bfd823b5
|
Omaha #3078 collaboration shared display data over private chat
Change-Id: I0ede9310eb109adc1b08673027e9e36a68a09fbf
Former-commit-id: bb4ff41368 [formerly b518cb2418] [formerly 9a427606ae] [formerly bb4ff41368 [formerly b518cb2418] [formerly 9a427606ae] [formerly add8286d52 [formerly 9a427606ae [formerly a51847aff197f805a4e48c9ecdb0c16f874e6a78]]]]
Former-commit-id: add8286d52
Former-commit-id: 14f305584c [formerly 13bf7e0793] [formerly 7d4355df36b7267b7d8e5f8b48c9fb8504d622ae [formerly 06b7415cec]]
Former-commit-id: 2fa150259f46192684548e39c2a4554b8bb99074 [formerly a993d1f90a]
Former-commit-id: 3702533a45
|
2014-06-17 14:32:17 -05:00 |
|
Nate Jensen
|
f341557750
|
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 1dcfbab3fd [formerly bd2ef07395] [formerly d8dc6eceef] [formerly acd7620d7a [formerly d8dc6eceef [formerly 6efd831efcc5372c7e7bfd52265d13de382407ee]]]]
Former-commit-id: acd7620d7a
Former-commit-id: 552727890e [formerly fe52a8f7f8] [formerly 189ef3ff5243b921f4ff74fce6202acf120c0e31 [formerly 485aced54c]]
Former-commit-id: 8706b19365d6044c3efb7b7c6d2cd0268dad19a5 [formerly 479ccb41f4]
Former-commit-id: 1b2612e117
|
2014-06-17 14:21:55 -05:00 |
|
Ron Anderson
|
261e98ef93
|
Merge "Omaha #3274 switch viz to G1 garbage collector" into omaha_14.4.1
Former-commit-id: 39bf0a24c0 [formerly b0a7be6203] [formerly d5c2170a20] [formerly 39bf0a24c0 [formerly b0a7be6203] [formerly d5c2170a20] [formerly 855b4ad7c1 [formerly d5c2170a20 [formerly a971a5b1d27611c8b3a9a47b76efafa0c2c7a9fc]]]]
Former-commit-id: 855b4ad7c1
Former-commit-id: 25187d7d4e [formerly 32e707294a] [formerly 0861ed308e148cbeaaa53c965d244b1f6b419173 [formerly 79c6182cc9]]
Former-commit-id: ffa24225e1e2164669716753158df74e5fc74f13 [formerly b6f47567b2]
Former-commit-id: 450ece09b7
|
2014-06-17 13:54:11 -05:00 |
|
Ron Anderson
|
fa1cdb4149
|
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 8e920811f3 [formerly 404098d861] [formerly b7843361f6] [formerly 1a8ccd0181 [formerly b7843361f6 [formerly 0cf0e93eabd440cf0ca3e88ac36c62b3309b6527]]]]
Former-commit-id: 1a8ccd0181
Former-commit-id: 040334beb8 [formerly ed318889de] [formerly a5d0b7d3786feedc34e175c2fc44d93cb8d20dac [formerly e31eabe77b]]
Former-commit-id: a5c5c37b3171605f3891f1d88f2d9f0f639cbce6 [formerly 2728191963]
Former-commit-id: f2c24187a2
|
2014-06-17 13:46:38 -05:00 |
|
Brian Clements
|
9a00d07136
|
Omaha #3078 added private chat to collaboration
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae
Former-commit-id: 8fee2a762c [formerly 86e89665bf] [formerly 37699395ef] [formerly 8fee2a762c [formerly 86e89665bf] [formerly 37699395ef] [formerly 97a6f5bfe8 [formerly 37699395ef [formerly 93f7d7088e7d7888a878558c6f2fcc368bf3ab05]]]]
Former-commit-id: 97a6f5bfe8
Former-commit-id: 8487f6388c [formerly 51e2606277] [formerly c1fad1a9cd12f9a3fc09ba809d66fab6463a6e1a [formerly 60508bf674]]
Former-commit-id: c537c3bbdc8909d2bb251174082b96954a7eb632 [formerly 4433482d56]
Former-commit-id: cdcf7d8143
|
2014-06-17 11:52:58 -05:00 |
|
Nate Jensen
|
3c62a1a906
|
Omaha #3274 switch viz to G1 garbage collector
Change-Id: I720c4ebb21bd3a37dcc71f8879bb96edb6a0b109
Former-commit-id: 172777137a [formerly 14a520dbd9] [formerly 4a91c3320b] [formerly 172777137a [formerly 14a520dbd9] [formerly 4a91c3320b] [formerly 44cb0e6ae6 [formerly 4a91c3320b [formerly 0355813f030ac996427c64dfcb6cbd4dd781ad2f]]]]
Former-commit-id: 44cb0e6ae6
Former-commit-id: a115e851fb [formerly 439e037d03] [formerly a3713f79ee49f1e6f01c9ebf4f56ac3cf08b2e8c [formerly 3981241355]]
Former-commit-id: b6228cb159c4073552fff5ecb789b070f81770b9 [formerly fe47ecf6ce]
Former-commit-id: 54b72c7108
|
2014-06-17 10:54:57 -05:00 |
|
Brian Clements
|
ca995b0147
|
Omaha #3288 collaboration feed venue config comes from server
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0
Former-commit-id: f38f9fae51 [formerly 8205f7cd56] [formerly b6a2bf0ae4] [formerly f38f9fae51 [formerly 8205f7cd56] [formerly b6a2bf0ae4] [formerly 84e3f967d9 [formerly b6a2bf0ae4 [formerly baab2ea12e1117446295ae60bc06228eb6139895]]]]
Former-commit-id: 84e3f967d9
Former-commit-id: 2ffe303324 [formerly 4dc81aabfa] [formerly d0ae674bb4714971796f2565a9a4ddf679e2c503 [formerly 5436efb886]]
Former-commit-id: c3ef12c1785d8656503e4bcb5c340e093799684f [formerly 616315d830]
Former-commit-id: 0dcfac1a44
|
2014-06-17 09:26:24 -05:00 |
|
Nate Jensen
|
c0851e8750
|
Merge "Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings." into omaha_14.4.1
Former-commit-id: 40c2a6c486 [formerly 95b2e262a0] [formerly b1acd1709a] [formerly 40c2a6c486 [formerly 95b2e262a0] [formerly b1acd1709a] [formerly 9b7ed95e6b [formerly b1acd1709a [formerly 2ee54c1f78136332f1cd2c40da0c2e7953510e7f]]]]
Former-commit-id: 9b7ed95e6b
Former-commit-id: 3e520231e7 [formerly 99b46cfbcf] [formerly 3ab762d979230aedd7fdd4120f726266218ba049 [formerly 521065548d]]
Former-commit-id: 545f0284af8fb337409397018eab8ceeb811c24b [formerly ea80faede7]
Former-commit-id: 19383cbf10
|
2014-06-16 09:26:30 -05:00 |
|
Nate Jensen
|
e71313e589
|
Merge "Omaha #3265 Fix potential NPE in D2D time matching." into omaha_14.4.1
Former-commit-id: edfb0ca7d5 [formerly c2766190a4] [formerly 5fad6501a7] [formerly edfb0ca7d5 [formerly c2766190a4] [formerly 5fad6501a7] [formerly b3df7745d4 [formerly 5fad6501a7 [formerly 83d1a4b6e69e3fe1bb350beba4f36eb3bf34e05d]]]]
Former-commit-id: b3df7745d4
Former-commit-id: 8aeda0f379 [formerly ca06c42305] [formerly 90632f07aa8ff3bf10b73ad2f82c2aaa931c78b0 [formerly 752fe50104]]
Former-commit-id: 69344a48cdfa43ad82a7d50fb69bdcedb501f131 [formerly 35ed3931c3]
Former-commit-id: 2566b6419c
|
2014-06-16 09:00:47 -05:00 |
|
Nate Jensen
|
a957c5f46d
|
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 f29aea8b46 [formerly 4544d7d3e0] [formerly 181a87e72d] [formerly 5908a4501a [formerly 181a87e72d [formerly 34250721f97f05be61e9e4e8b6f71758347a9f60]]]]
Former-commit-id: 5908a4501a
Former-commit-id: fc4e336995 [formerly 8aa1e4aacb] [formerly fcdbaaf51981d91c6263b4126925c93995dd6a35 [formerly 442a3d9683]]
Former-commit-id: 93cf4a469d328c8dd65d64c3fa56f63894a27cd2 [formerly e01ddac6ad]
Former-commit-id: 450611cd70
|
2014-06-16 09:00:39 -05:00 |
|
Nate Jensen
|
071a95ebbf
|
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 8ce9a5e5b8 [formerly eddc8f373a] [formerly c2aa87470d] [formerly ed36453f09 [formerly c2aa87470d [formerly 93f63c0d42941001e4d59a4840df5e5b525592bf]]]]
Former-commit-id: ed36453f09
Former-commit-id: a7de352bc1 [formerly 50715cc012] [formerly b555e7ee30d9051470c8a8d81f5bb009419c6e82 [formerly ef61539a8a]]
Former-commit-id: 99700c1ab56b3871ef108964d94e2f4a3ce6d83e [formerly 48496aeb9b]
Former-commit-id: cc66519671
|
2014-06-16 08:31:30 -05:00 |
|
Steve Harris
|
563cf7b455
|
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: 4d724b6474 [formerly 97843cf58e] [formerly 9213369739] [formerly 4d724b6474 [formerly 97843cf58e] [formerly 9213369739] [formerly e1c8ad2611 [formerly 9213369739 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]]]
Former-commit-id: e1c8ad2611
Former-commit-id: 6cc0c35e76 [formerly d7cd0ac02c] [formerly 9dc77519d1d40439f9609aa1b8bb1f64c8a1ab8a [formerly 362988b9d7]]
Former-commit-id: 54590884305d436b0bff6e041169417a3fab2fbb [formerly 8270fd8a9f]
Former-commit-id: a0d17947a9
|
2014-06-16 08:19:12 -05:00 |
|
Ben Steffensmeier
|
0cd83ff331
|
Omaha #3265 Fix potential NPE in D2D time matching.
Former-commit-id: 0545a079a0 [formerly 9caf60a551] [formerly 81fbf3b697] [formerly 0545a079a0 [formerly 9caf60a551] [formerly 81fbf3b697] [formerly 29b423645e [formerly 81fbf3b697 [formerly 9fea363e4fd21f2e9dc06b9450b71eb174dd0a29]]]]
Former-commit-id: 29b423645e
Former-commit-id: 335708086d [formerly 18f1cd9d5b] [formerly 73020fa04763bf0f6d2782ad152a62f4c6003a05 [formerly b0ff6298f1]]
Former-commit-id: 354e98f1422b6bc62798a35aa673f684955f81eb [formerly 07f36a59a7]
Former-commit-id: 6594b9dbd8
|
2014-06-13 16:58:35 -05:00 |
|
Ben Steffensmeier
|
540dd75437
|
Omaha #3163 Fix NPE when styleless strings are sent to 14.3
Former-commit-id: 4080f9b50b [formerly d2997f9fc0] [formerly 1f8f612d3a] [formerly 4080f9b50b [formerly d2997f9fc0] [formerly 1f8f612d3a] [formerly 7245544e1f [formerly 1f8f612d3a [formerly 3c1dd0e7daea7149a02b1a5e2be1a0db27e662d5]]]]
Former-commit-id: 7245544e1f
Former-commit-id: 5e27e70ef4 [formerly 1282f74317] [formerly 72a46674d2bd2b673c6f6d5144b572dcbdcb7fe9 [formerly 59b5076a66]]
Former-commit-id: b449ad4217f727e43e6cf545dbeab7cbd036c1b5 [formerly 991dff52d2]
Former-commit-id: 307f065952
|
2014-06-13 16:49:25 -05:00 |
|
Brian.Dyke
|
8a771cc705
|
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: 232d538288 [formerly 06c565d74f] [formerly 30d8644fa5] [formerly 232d538288 [formerly 06c565d74f] [formerly 30d8644fa5] [formerly 482f915b42 [formerly 30d8644fa5 [formerly 4b317062ce5c35823210cbbf023c0f0fc8051ef3]]]]
Former-commit-id: 482f915b42
Former-commit-id: aa70f67645 [formerly c1bd7a0c55] [formerly aa11101c8c0f5e91cdf9e5a2ddbd70bdcc0dd9a3 [formerly 072a4a9d63]]
Former-commit-id: 220ffe796aa220960bdf60c9b20ae4086c78d256 [formerly ce9ebc90f5]
Former-commit-id: 03f8202ff2
|
2014-06-13 14:05:49 -04:00 |
|
Brian.Dyke
|
54db4c05b5
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: 4766b3f49f [formerly 5064d24e26] [formerly 346bf852cd] [formerly 4766b3f49f [formerly 5064d24e26] [formerly 346bf852cd] [formerly 81832d97e5 [formerly 346bf852cd [formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]]]]
Former-commit-id: 81832d97e5
Former-commit-id: ba9fb22f58 [formerly 764b729546] [formerly 4b8123012f6cebd56dd11d52a9381b3f0d930dd0 [formerly 4bca0769fb]]
Former-commit-id: 6a3a4bbef432d2ba4ec423342a3283d6354a3f92 [formerly 766974a05d]
Former-commit-id: 3da13f3d12
|
2014-06-13 13:21:19 -04:00 |
|
Nate Jensen
|
4e4002487e
|
Merge "Omaha #3263 Check for null when mosaic time matches." into omaha_14.4.1
Former-commit-id: 6419485d6b [formerly 254ba2762f] [formerly ba2f130b13] [formerly 6419485d6b [formerly 254ba2762f] [formerly ba2f130b13] [formerly fc905ca588 [formerly ba2f130b13 [formerly c8f486ed32dfffff69ff9e9fefe1320c4ec009f4]]]]
Former-commit-id: fc905ca588
Former-commit-id: 0da2942751 [formerly 55ddf5dbe7] [formerly fef2d2cc237d1c98ba1f4ca5330b4a3f07d59514 [formerly 907fc445a3]]
Former-commit-id: 386c8af27567690ed41ab220f02a41ed273887f1 [formerly 198da6201c]
Former-commit-id: cfa8bc6903
|
2014-06-12 15:14:50 -05:00 |
|
Brian Clements
|
547bad711a
|
Omaha #3267 fixed collaboration NPE possibility
Change-Id: I9bc68be7d9106396a0c369e3181e15baf25ca260
Former-commit-id: 667cda6c19 [formerly 42e6e38c2e] [formerly adbffa5ddd] [formerly 667cda6c19 [formerly 42e6e38c2e] [formerly adbffa5ddd] [formerly 91eb7d40c2 [formerly adbffa5ddd [formerly a23e57f3d1a6f4213216a7e038b85b17b6628faa]]]]
Former-commit-id: 91eb7d40c2
Former-commit-id: 54081d0255 [formerly b1fac777f4] [formerly 6dcce07d15edffe9b65d033992c7dff4c59bc36b [formerly 3bdbf79eeb]]
Former-commit-id: 0299c53f7e72fd336d2e410db8f9ab7456ee054d [formerly e13aeb0ca5]
Former-commit-id: 338f293065
|
2014-06-12 15:06:46 -05:00 |
|
Ben Steffensmeier
|
3ec23a665b
|
Omaha #3263 Check for null when mosaic time matches.
Former-commit-id: 0016b16e61 [formerly c105de1a4c] [formerly 5355ca8c1c] [formerly 0016b16e61 [formerly c105de1a4c] [formerly 5355ca8c1c] [formerly df2fed2be3 [formerly 5355ca8c1c [formerly 913d70b860c1f129d1632dfd1d84e5fbcca5e2d9]]]]
Former-commit-id: df2fed2be3
Former-commit-id: 9b4a68da6a [formerly 6309145495] [formerly d5d5ea212b4485c552aa4ab09ab99a2291039c5b [formerly ab616254bf]]
Former-commit-id: cc241cbc94795a69fda0a400d9836465d759ad61 [formerly 5e433c9871]
Former-commit-id: c73ec7db64
|
2014-06-12 15:00:26 -05:00 |
|
Nate Jensen
|
eb388ac9df
|
Merge "Omaha #2061 Remove dataURI from acars." into omaha_14.4.1
Former-commit-id: d245b20260 [formerly dd10c76b19] [formerly 387b0604cc] [formerly d245b20260 [formerly dd10c76b19] [formerly 387b0604cc] [formerly d3417d8e45 [formerly 387b0604cc [formerly 6e2588a672ceb81a922be9fcdac9a4212376ed5f]]]]
Former-commit-id: d3417d8e45
Former-commit-id: d123e7126b [formerly 66c3efd784] [formerly 604e4e6d714b5909601fc414e9181573502a3eb4 [formerly 6220def099]]
Former-commit-id: 7a694f7521759ee98474e1127e81419911a63eec [formerly 4dc987369a]
Former-commit-id: 53fe673750
|
2014-06-12 14:27:47 -05:00 |
|
Ben Steffensmeier
|
d9d9adcd51
|
Omaha #2061 Remove dataURI from acars.
Former-commit-id: baec34d0ab [formerly 0a6e99e9d1] [formerly f66725a515] [formerly baec34d0ab [formerly 0a6e99e9d1] [formerly f66725a515] [formerly 35ad2f2b8d [formerly f66725a515 [formerly e8b5ea58ca12878922be01c815a354703f5f4387]]]]
Former-commit-id: 35ad2f2b8d
Former-commit-id: 424dc5f1ed [formerly 4e3a8e97fe] [formerly 97fb2d18a8c220127d0a99f5a48ce942f2d7954a [formerly e227d408db]]
Former-commit-id: a6c782493c2b11776e2efc2dcd6010d50addcf85 [formerly 81b4860e27]
Former-commit-id: deaecfc649
|
2014-06-12 13:59:45 -05:00 |
|