Commit graph

6216 commits

Author SHA1 Message Date
Richard Peter
0b0b58e89c Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py

Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61

Former-commit-id: ed38bf2372 [formerly 6636b301e5] [formerly 93bbd98cbc] [formerly ed38bf2372 [formerly 6636b301e5] [formerly 93bbd98cbc] [formerly 8ecc27f714 [formerly 93bbd98cbc [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]]
Former-commit-id: 8ecc27f714
Former-commit-id: 948e0cd011 [formerly 552ac6d640] [formerly bb5cc0ca71fa6abf17e95b29fbe41a184ac1297e [formerly fc27824dbc]]
Former-commit-id: 98c7362b289abd5b8e115f957b14dcd73116b99a [formerly 0fefdc7cd6]
Former-commit-id: 342192e967
2014-07-01 15:34:39 -05:00
Steve Harris
7408b3e09d Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
Former-commit-id: 6a7aeb3557 [formerly f68e051938] [formerly 1c8dc56d49] [formerly 6a7aeb3557 [formerly f68e051938] [formerly 1c8dc56d49] [formerly 30cdbff7f8 [formerly 1c8dc56d49 [formerly 382c772c196711d230395f34a04559c188880622]]]]
Former-commit-id: 30cdbff7f8
Former-commit-id: 3369bc4a1d [formerly a4d91c59d6] [formerly f86265bab0c346864e940cc8c360ec5235644553 [formerly 6f9129ac78]]
Former-commit-id: 6030625bf5e788ecaebe0b3ec7cdd364685df43e [formerly d600ed9acf]
Former-commit-id: 15267970e4
2014-07-01 13:38:18 -05:00
Nate Jensen
eee4a69f11 Merge "Omaha #1798 fixed collaboration drawing issues when leader shares new map" into omaha_14.4.1
Former-commit-id: 71025bcc3d [formerly 81ca7a9e9f] [formerly c0d36e9a69] [formerly 71025bcc3d [formerly 81ca7a9e9f] [formerly c0d36e9a69] [formerly 1183c0538e [formerly c0d36e9a69 [formerly 3d0df846090261417f9c9b2e75cf6c439f9b979f]]]]
Former-commit-id: 1183c0538e
Former-commit-id: 886348da08 [formerly 52d5edac63] [formerly ad38ccbb38ccc3c1e25afc6279df150354266fb5 [formerly cb9e715aec]]
Former-commit-id: 7e40e67a6c3c32d32eefa89c005c098e6189c848 [formerly 10dee29029]
Former-commit-id: 7d03309e18
2014-07-01 10:30:54 -05:00
Nate Jensen
c790f68d66 Merge "Omaha #3165 remove deprecated buildColorMap()" into omaha_14.4.1
Former-commit-id: 479b22f6a1 [formerly ac0f0e2298] [formerly 0a9fc691b9] [formerly 479b22f6a1 [formerly ac0f0e2298] [formerly 0a9fc691b9] [formerly fbda7c4489 [formerly 0a9fc691b9 [formerly 221f81f4368a6bbd69255a1a148e055d65a2c957]]]]
Former-commit-id: fbda7c4489
Former-commit-id: d1ce9eed5b [formerly fe1f9e8977] [formerly 42f3d41f4fbd3ce168d8d1117e5ce0b5a752ff73 [formerly 9e6433f44b]]
Former-commit-id: c95a4ea6c20a688372f25863036f83f25fb0d751 [formerly 6f0d007112]
Former-commit-id: 73bdd3a339
2014-07-01 10:22:25 -05:00
Greg Armendariz
0121d94f03 Merge "Omaha #3299 - Remove project file and change build reference" into omaha_14.4.1
Former-commit-id: 80fd17a8c2 [formerly 134f0e2e8b] [formerly 82fe8608e0] [formerly 80fd17a8c2 [formerly 134f0e2e8b] [formerly 82fe8608e0] [formerly 0688e9db1b [formerly 82fe8608e0 [formerly e6a5ab99510887f28c4a98afaa28f122f814d5a5]]]]
Former-commit-id: 0688e9db1b
Former-commit-id: 0cf0691534 [formerly 471814e891] [formerly 0c71de38675483377fcc4044afeaeebf792c0ac2 [formerly fa76c0c1df]]
Former-commit-id: 6252343794d6ac450151a70ba4b1f587e76f217a [formerly 36252d33b2]
Former-commit-id: 900bd92331
2014-07-01 10:17:11 -05:00
Nate Jensen
3f825c4392 Merge "Omaha #3008 Refactor to use EventReport to parse reports and better log reports with missing fields. Update manifest. Log number of discarded reports. Discard all reports if missing the data range." into omaha_14.4.1
Former-commit-id: 049450c5a9 [formerly 3b2dc2915e] [formerly 35e3626527] [formerly 049450c5a9 [formerly 3b2dc2915e] [formerly 35e3626527] [formerly 1d2ae81ff6 [formerly 35e3626527 [formerly 76fd0a563baa40722ce645d8019c40dbc42405b6]]]]
Former-commit-id: 1d2ae81ff6
Former-commit-id: 85cc42e2ea [formerly 14d368f33b] [formerly b0a8ca8bad14719bc878aa96cef1d2c4e21ce2b8 [formerly 8a03a5ecb9]]
Former-commit-id: 65a864d9ae998ba0c7b400b056ef97cb2a4efb17 [formerly c0096b0570]
Former-commit-id: 5ed2cdc4ec
2014-07-01 10:12:14 -05:00
Steve Harris
1bbbdc9c62 Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
	edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5

Former-commit-id: 741dc31fcb [formerly 2f2958df37] [formerly d4dc1723c1] [formerly 741dc31fcb [formerly 2f2958df37] [formerly d4dc1723c1] [formerly 7acd9ab2dd [formerly d4dc1723c1 [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: d70da4127e [formerly 7fb4663d75] [formerly 109f5e557e8f5a7076b56c4f8d0f0c548c0f0cc6 [formerly dcbab5621f]]
Former-commit-id: 8343b8e876918b72044e0b509f5b5b8afdbd53e2 [formerly 71357da9d2]
Former-commit-id: 8fb747ad27
2014-07-01 11:08:46 -04:00
Richard Peter
76d59a8839 Merge "Omaha #3255 Updated Proxy classes to include all java proxy config settings" into omaha_14.4.1
Former-commit-id: a15a86a911 [formerly 838739ebbb] [formerly 027fff1de0] [formerly a15a86a911 [formerly 838739ebbb] [formerly 027fff1de0] [formerly e7d0dd1e28 [formerly 027fff1de0 [formerly 33080d565ceb85a0a0945f7c0d6a81caaa715b62]]]]
Former-commit-id: e7d0dd1e28
Former-commit-id: 4a4439d2fd [formerly d0ce3374a7] [formerly 3c7b196920448f0555c2b06dac63f232e194c048 [formerly 0cef25a49c]]
Former-commit-id: fd351a07bc37c48c477a9c5da001e5db5adeb266 [formerly a936bb8c7c]
Former-commit-id: 2bf09c794f
2014-07-01 10:02:57 -05:00
Richard Peter
ffe546f816 Merge "Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order." into omaha_14.4.1
Former-commit-id: 1024035422 [formerly 20eeb493bb] [formerly 6d9db0784a] [formerly 1024035422 [formerly 20eeb493bb] [formerly 6d9db0784a] [formerly e6ac1b2ec8 [formerly 6d9db0784a [formerly 1e9ec8669f14dcae4e59ba5e471906de3bdc01a9]]]]
Former-commit-id: e6ac1b2ec8
Former-commit-id: 17839c2514 [formerly 2965150f36] [formerly f3ceb72fd3502a79aad5e85f5fd66b79cc0bab66 [formerly 3de8492ff3]]
Former-commit-id: a70bbfc5b1d3137936ce79f8cf308613fb74cf69 [formerly e659b5a694]
Former-commit-id: 8c2a97eb67
2014-07-01 09:48:20 -05:00
Nathan Bowler
7fcdbd8b20 Omaha #3008 Refactor to use EventReport to parse reports and better log reports with missing fields. Update manifest. Log number of discarded reports. Discard all reports if missing the data range.
Change-Id: I63681d5172689711834f3d71df9424c68a1f5317

Former-commit-id: 7908a8a361 [formerly f3fc00fb32] [formerly 43f164e682] [formerly 7908a8a361 [formerly f3fc00fb32] [formerly 43f164e682] [formerly 6099815272 [formerly 43f164e682 [formerly 2d389525e2897237a66eb145002a9ae8970c9993]]]]
Former-commit-id: 6099815272
Former-commit-id: 90bbbda6a1 [formerly f667260f7c] [formerly bb87e2875751743fc9de40e346825a9ff85d8040 [formerly 175f879042]]
Former-commit-id: 3a520e633c52b49941f91bfeb4aae6a8ca63419a [formerly 047fc6ec88]
Former-commit-id: d54fa442d8
2014-07-01 09:19:15 -04:00
Nate Jensen
ee9c8b0fb9 Merge "Omaha #3245 fix detection of correct ini file" into omaha_14.4.1
Former-commit-id: 0080d97655 [formerly 03efa73bd7] [formerly 63bc6ed372] [formerly 0080d97655 [formerly 03efa73bd7] [formerly 63bc6ed372] [formerly fb84c94552 [formerly 63bc6ed372 [formerly 933384a7ace268be2c267c7dd630dee6d1d42fd0]]]]
Former-commit-id: fb84c94552
Former-commit-id: d4b265fcca [formerly 7314f9c2f1] [formerly 4978882e135ef3f25c2e0ca1dfb306b8b77a8b49 [formerly 01115d0ad0]]
Former-commit-id: 771686decac75f30c6529d246ca4f20201dfebad [formerly a2ab4f6c76]
Former-commit-id: 94cd22b009
2014-06-30 16:21:09 -05:00
Benjamin Phillippe
19c30949ec Omaha #3255 Updated Proxy classes to include all java proxy config settings
Change-Id: Id59993de7bc0f8402f2842161bf8ba4bc2532c79

Former-commit-id: 2075f59d58 [formerly 15b1fb71dd] [formerly 36ef9e7a1a] [formerly 2075f59d58 [formerly 15b1fb71dd] [formerly 36ef9e7a1a] [formerly 0dd6262862 [formerly 36ef9e7a1a [formerly 6cd596e6ed8826365d0faeab766601f98ece4fca]]]]
Former-commit-id: 0dd6262862
Former-commit-id: 84c1981492 [formerly 2a294fcfce] [formerly 10234eec2313785565f827f368277fe480ed8838 [formerly 3a90b09dbf]]
Former-commit-id: 75bfc785082483f055c277b02e8bd0344f5dadb1 [formerly f686610802]
Former-commit-id: 3abde21053
2014-06-30 16:00:58 -05:00
Brian Clements
9f8aea91aa Omaha #1798 fixed collaboration drawing issues when leader shares new map
fixed cursor icon not updating properly
fixed attempting to draw to inactive layer

Change-Id: Ic0f29feddbd611d918ba9d7e5a515a7624bf72aa

Former-commit-id: 309900daab [formerly 0125117d9c] [formerly 88ba6b47ad] [formerly 309900daab [formerly 0125117d9c] [formerly 88ba6b47ad] [formerly fc70dbc86e [formerly 88ba6b47ad [formerly 4df0a485d285a920a53e812bec204683f5ff29f6]]]]
Former-commit-id: fc70dbc86e
Former-commit-id: 7ffa3c80c1 [formerly b186894f32] [formerly a1b5881328dc0f2810d69ead13548d6326a348b7 [formerly 44f8b3dce1]]
Former-commit-id: 90997d544f594bee31f8c51f3afea29977b1417d [formerly 0be4260b4c]
Former-commit-id: be0185379b
2014-06-30 15:57:58 -05:00
Nate Jensen
be7402f054 Omaha #3245 fix detection of correct ini file
Change-Id: I623f436da452258a3d70c9379779d4975bfe4ed7

Former-commit-id: e9ffe3f2d6 [formerly d72b56b988] [formerly bca39f8b39] [formerly e9ffe3f2d6 [formerly d72b56b988] [formerly bca39f8b39] [formerly 48249301fc [formerly bca39f8b39 [formerly 597b6bfe5ddf6978702a2b87a15f0bbeddc8f453]]]]
Former-commit-id: 48249301fc
Former-commit-id: 4dd144d873 [formerly 0f0e890fce] [formerly c525443c556f5d3c4e3585bc6ee865de49c0fa07 [formerly 1d6912b4dd]]
Former-commit-id: 8838747449e3a1b1a8d2c17d9a358b4e5376a19f [formerly 635e902b80]
Former-commit-id: d189ad3b7a
2014-06-30 15:53:41 -05:00
Greg Armendariz
c3bc9d54a0 Omaha #3299 - Remove project file and change build reference
Former-commit-id: c8dcf22c40 [formerly 20f5ccf9f0] [formerly f4063c8162] [formerly c8dcf22c40 [formerly 20f5ccf9f0] [formerly f4063c8162] [formerly 40ad6795df [formerly f4063c8162 [formerly c233ad285b9addca8a8be6074b1e2440896d2276]]]]
Former-commit-id: 40ad6795df
Former-commit-id: 4829515d8b [formerly 68846930ee] [formerly 59a419b15250da8d89339fae8df0b0dcea68d9f8 [formerly 44b448738c]]
Former-commit-id: f78f6ac73b275f66e33dc7bd717128b06fa613d6 [formerly d26bb8e2c2]
Former-commit-id: 941bc791a9
2014-06-30 14:49:24 -05:00
Nate Jensen
7f5285bf96 Omaha #3165 remove deprecated buildColorMap()
Change-Id: I1bcf368173ff785c0e05acb9c14cfbaa33080bed

Former-commit-id: b7c6ab2386 [formerly a393ad429a] [formerly 766d3323d3] [formerly b7c6ab2386 [formerly a393ad429a] [formerly 766d3323d3] [formerly 128950ec19 [formerly 766d3323d3 [formerly 6b3aa0f461293e6b8d94f8cfc5f956ab172b2e3c]]]]
Former-commit-id: 128950ec19
Former-commit-id: c8d32368ee [formerly 4ac06c06ee] [formerly d73b0a686415d6d641d233bfd24d10daefab34d7 [formerly 2bf3449e00]]
Former-commit-id: f3f1fbc5a2e3ec9b02255dccd1989db205cdb8ee [formerly 345de597a6]
Former-commit-id: 25b2c1fa3e
2014-06-30 13:22:57 -05:00
Lee Venable
c65c39934d Omaha #3161 - Added SWT dialog trim to the dialogs for thin client.
Former-commit-id: b3f0099029 [formerly 02037fc2df] [formerly 588d3084da] [formerly b3f0099029 [formerly 02037fc2df] [formerly 588d3084da] [formerly 07a7a00256 [formerly 588d3084da [formerly 3d267d269db54c12852b6b6e8c529d826fad1d90]]]]
Former-commit-id: 07a7a00256
Former-commit-id: 4f413032e3 [formerly e5f1eaf67d] [formerly fc579be7cecbd579b95c1f5d5f7bbe974dc68c31 [formerly c6e53f6a9b]]
Former-commit-id: 049ab47ed6895126be0b8ff0b09a75d6c325e763 [formerly 6046a2cbe1]
Former-commit-id: 44f67ce5ad
2014-06-30 13:15:31 -05:00
Nate Jensen
daa232b3d2 Merge "Omaha #3170 get accum value from multiple times if they are requested in FFMP geometry factory" into omaha_14.4.1
Former-commit-id: ab51c67540 [formerly fff613478c] [formerly 098322ded4] [formerly ab51c67540 [formerly fff613478c] [formerly 098322ded4] [formerly daacd735e7 [formerly 098322ded4 [formerly af116a40bfc5f96ac5be8f638d02ad85ad19e454]]]]
Former-commit-id: daacd735e7
Former-commit-id: a2e5cd6ac7 [formerly e98a95687b] [formerly b718b5de437c7e83a65d6645ffa3e9fd4deb4ade [formerly 8a274be75f]]
Former-commit-id: cc6c8075c00859ac53e1da590f21915076538a29 [formerly b0daf485ba]
Former-commit-id: bb71f188a2
2014-06-30 12:04:21 -05:00
Nate Jensen
8771aee35d Merge "Omaha #3303 make FFMPResource interrogatable" into omaha_14.4.1
Former-commit-id: 914683e8a5 [formerly 1137ef84fd] [formerly 9fddc57142] [formerly 914683e8a5 [formerly 1137ef84fd] [formerly 9fddc57142] [formerly fdddf1e096 [formerly 9fddc57142 [formerly fe2b362a609f2d9aa60bc21e8c23ebbcc118a5dd]]]]
Former-commit-id: fdddf1e096
Former-commit-id: 108be98832 [formerly cc66308aaa] [formerly 9468d0a901837ec71be397a13e71483e27e0c273 [formerly 1ac5c54ee3]]
Former-commit-id: 44b6830b6ca7df9073bb2997f0cd12ba1cc234a3 [formerly c6c921279a]
Former-commit-id: 29a41f81c2
2014-06-30 12:03:21 -05:00
Nate Jensen
887fb84cde Merge "Omaha #2760 Made external JMS route for registry events Change-Id: I8ff1af48468896dadd41bdcf8a6e6e7bc24c9eb6" into omaha_14.4.1
Former-commit-id: 19a634f97c [formerly 5577128de2] [formerly ef92f03f06] [formerly 19a634f97c [formerly 5577128de2] [formerly ef92f03f06] [formerly d6008fc401 [formerly ef92f03f06 [formerly a3364fed45ee7b5872565ba0c5a1c645d416b4c9]]]]
Former-commit-id: d6008fc401
Former-commit-id: 53ba2a3e01 [formerly 0bb74e3900] [formerly cca82fa69008d10eb57624c026f7d441b5b5a30d [formerly 4f0160d98a]]
Former-commit-id: 85845022354e575d88bc499afc792f3dbcfaa449 [formerly 58a5daa450]
Former-commit-id: b44c1dae06
2014-06-30 11:04:55 -05:00
Slav Korolev
896b7c59d1 Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order.
Former-commit-id: 64e9564de0 [formerly cd740de298] [formerly 1b870e21fc] [formerly 64e9564de0 [formerly cd740de298] [formerly 1b870e21fc] [formerly 1956077e1a [formerly 1b870e21fc [formerly 5c5513637b7eb223572cc3425a3c1623cde84d90]]]]
Former-commit-id: 1956077e1a
Former-commit-id: 3e4c08d4ef [formerly e8811128fc] [formerly f18e8934ed21b7acc8f3181e19942bfba56cdf4c [formerly 0f5a2c0233]]
Former-commit-id: c7a99399c01956b4c0308375cdf8c555baeec8f2 [formerly a78f0ea765]
Former-commit-id: 5395df01c9
2014-06-30 09:40:32 -04:00
Richard Peter
c2835d25ac Merge "Omaha #3323 fixed collaboration disposed font issue" into omaha_14.4.1
Former-commit-id: 5a74a3cf99 [formerly bcffac8875] [formerly 706409b459] [formerly 5a74a3cf99 [formerly bcffac8875] [formerly 706409b459] [formerly f4cdd661fe [formerly 706409b459 [formerly f81ae068eca41eeae5d785668f4c1d7cf59ae9df]]]]
Former-commit-id: f4cdd661fe
Former-commit-id: 570bf42f89 [formerly b94dc3b045] [formerly 9e7fc0b82ae20bc6493ceddb6809f83261c06966 [formerly e3c3d55883]]
Former-commit-id: 731bb0268edd89c419ea3b8bb57b91ea5afc516a [formerly 25dd598b55]
Former-commit-id: 50fdb66cb4
2014-06-27 16:52:39 -05:00
Richard Peter
e6ee020f9d Merge "Omaha #3281 made venue session views non-sticky (except for feed view)" into omaha_14.4.1
Former-commit-id: 90dd05664d [formerly cfdb8eebfc] [formerly 48aceec348] [formerly 90dd05664d [formerly cfdb8eebfc] [formerly 48aceec348] [formerly cfb9e6d0ad [formerly 48aceec348 [formerly d7a09b5baa955732e94a0d043fc24e6a9770b7f1]]]]
Former-commit-id: cfb9e6d0ad
Former-commit-id: bc43fa3722 [formerly d15be4d4a1] [formerly eb62a7da73e93f0a97aa85a3191e21df053469ca [formerly b1810026c8]]
Former-commit-id: ffce97b79e3bf6cf71a787a276401e8ab159977a [formerly 8b8f6ff0fe]
Former-commit-id: 3847155429
2014-06-27 16:51:36 -05:00
Brian Clements
e25a446dae Omaha #3323 fixed collaboration disposed font issue
Change-Id: I89fda01efad46299a08b3067edc3f16a812a31c2

Former-commit-id: c2cd991296 [formerly 023d1bde0b] [formerly dc7a76197d] [formerly c2cd991296 [formerly 023d1bde0b] [formerly dc7a76197d] [formerly fe149faffa [formerly dc7a76197d [formerly e216af49d135ceeff5e6cd251c6742602230553c]]]]
Former-commit-id: fe149faffa
Former-commit-id: 6bae8b556c [formerly b8dc75d192] [formerly 54898f3b2d36260900cf96d8c93cda806a155e01 [formerly cb108f12b8]]
Former-commit-id: f94b54e29b3d2880b30c8a131c9ec16015f7c641 [formerly 0800ea7cb7]
Former-commit-id: ac986ca600
2014-06-27 16:33:27 -05:00
Richard Peter
dbe5a3ffe6 Merge "Omaha #3319 switched capture to only dump live objects" into omaha_14.4.1
Former-commit-id: 6a8bc2bac2 [formerly 88bde6f690] [formerly 363206fea0] [formerly 6a8bc2bac2 [formerly 88bde6f690] [formerly 363206fea0] [formerly 52210230db [formerly 363206fea0 [formerly f75593cb09fe67ca48feb7ac0e67aa2b13221d79]]]]
Former-commit-id: 52210230db
Former-commit-id: 56e683ad4c [formerly ad1796d08c] [formerly 2de9b5a7ee4224f4e7caadb35f20b488694c1e61 [formerly 743f247e16]]
Former-commit-id: 64762ab24ca6f9fc411e238381162afb9c4c234d [formerly 5779cda971]
Former-commit-id: 97e3cc1fa6
2014-06-27 16:01:06 -05:00
Brian Clements
1fc32ef3c5 Omaha #3281 made venue session views non-sticky (except for feed view)
Change-Id: If36f1c53155f39c46b05302880a046f3b4a5ceb0

Former-commit-id: 9425ad16a3 [formerly eb806a6bb3] [formerly 741afe7d39] [formerly 9425ad16a3 [formerly eb806a6bb3] [formerly 741afe7d39] [formerly 31a08efb61 [formerly 741afe7d39 [formerly e7f48359f00b2e91b39b7646da0f9f409f5d3805]]]]
Former-commit-id: 31a08efb61
Former-commit-id: 46526f932b [formerly 2350f7f630] [formerly 93c5a5d813b69eae74ceea0b7251e483a789c393 [formerly ed2823daef]]
Former-commit-id: a6fba588dbe193fe0fe78c90743505b834dd3904 [formerly c1bfab0914]
Former-commit-id: 55e3b3673c
2014-06-27 15:33:11 -05:00
Brian Clements
6ba5ec6d70 Omaha #3319 switched capture to only dump live objects
work around for java 1.7 G1 garbage collector jmap problem

Change-Id: I5dd8db5d2d98baacaa03a3b60d1d9c5cb350fc2d

Former-commit-id: e2907258b0 [formerly 312f74a200] [formerly 92a510fcb8] [formerly e2907258b0 [formerly 312f74a200] [formerly 92a510fcb8] [formerly fe6b3ff4b3 [formerly 92a510fcb8 [formerly 54157c12af81c4e217d3ade436bc0b3723964cac]]]]
Former-commit-id: fe6b3ff4b3
Former-commit-id: 2f9d0880c3 [formerly deb7669844] [formerly e4117a8bcf794771d4a16a7437f9f028c2310101 [formerly 6353125f62]]
Former-commit-id: e623c3817afb544dd1e72e6286da9a323ee41d9f [formerly 4c49ba9f65]
Former-commit-id: 7d47dc8020
2014-06-27 12:47:17 -05:00
Slav Korolev
e3d989504c Omaha #3234 - Removed HiResW-ARW-PR and HiResW-NMM-PR from the list.
Former-commit-id: 0f048d2c0c [formerly 6e60afd8cf] [formerly b72f146d95] [formerly 0f048d2c0c [formerly 6e60afd8cf] [formerly b72f146d95] [formerly f6e8dedfa3 [formerly b72f146d95 [formerly 834358236059cbabd11e89b2d43f7f1c621ce2e5]]]]
Former-commit-id: f6e8dedfa3
Former-commit-id: 7fa0a80090 [formerly 34d57cd15e] [formerly 31447de11fcb6e2546cb39702813ba6cf2f0ba14 [formerly 03890f03e3]]
Former-commit-id: 8ed7b73c8cf35ecfa3aac5e18de6fbaf88b30690 [formerly 99fc9b951a]
Former-commit-id: a8e4449248
2014-06-27 12:29:25 -04:00
Brian Clements
aecda5caac Omaha #3214 excluded total lightning data from text distribution
Change-Id: I9ab3676be7dfae30c60f43eaec58baae32b37d76

Former-commit-id: b81f1e2309 [formerly 0d8668c6b9] [formerly f217240f5c] [formerly b81f1e2309 [formerly 0d8668c6b9] [formerly f217240f5c] [formerly 362e8d543f [formerly f217240f5c [formerly 360d6b0d35cdc824b7cfa64c4140eb4af55a0696]]]]
Former-commit-id: 362e8d543f
Former-commit-id: 205c1e1b8f [formerly 76464a3f93] [formerly cc6bea81a10497210db84563ae96ed4f764e3452 [formerly eb19700c16]]
Former-commit-id: 6fbd55346bb51f9c69100a190dd71a2282191f7d [formerly e66894fc5a]
Former-commit-id: 03b93a13f0
2014-06-27 10:46:48 -05:00
Dave Hladky
176724af0c Omaha #2760 Made external JMS route for registry events
Change-Id: I8ff1af48468896dadd41bdcf8a6e6e7bc24c9eb6

Former-commit-id: 4c1abdefcd [formerly 445ddc86a5] [formerly 5556e447e6] [formerly 4c1abdefcd [formerly 445ddc86a5] [formerly 5556e447e6] [formerly 0d1767a3d7 [formerly 5556e447e6 [formerly 22e51bc1f882c535c7bafcdfd84428700eb6e547]]]]
Former-commit-id: 0d1767a3d7
Former-commit-id: d0ff4d25f9 [formerly 891aba68a8] [formerly 3f360ed3b5640e5962d8f52d7120e7cbdc887e10 [formerly aa507be41e]]
Former-commit-id: a8c8bf82d0ffd60b6f6d6fc0e95f8c35bcb0d8ad [formerly 9ca81064df]
Former-commit-id: 963c1e9831
2014-06-27 10:04:17 -05:00
Richard Peter
99c550709e Omaha #3274 Tweak G1 Flags for Cave
Change-Id: I7d8ac93f2a245ff35261b2f98f997d201495c4f6

Former-commit-id: 1a472d4b2e [formerly 6bc89f2420] [formerly 46f42687e2] [formerly 1a472d4b2e [formerly 6bc89f2420] [formerly 46f42687e2] [formerly 56389ef395 [formerly 46f42687e2 [formerly e16fd779239a09735d6ea092058a39bc7263b2f1]]]]
Former-commit-id: 56389ef395
Former-commit-id: bcf92a4b08 [formerly 2d18721bd6] [formerly 395291351cc63f90d7019e4eb6186c1ef830f36e [formerly 5112bbb8d5]]
Former-commit-id: 40b5d58c95a8b7c0f6129a2b1c88baa2f6af8cdf [formerly c5003ff6c4]
Former-commit-id: 7daa1ed24b
2014-06-26 17:46:57 -05:00
Matt Nash
b6e460a97a Omaha #3303 make FFMPResource interrogatable
Change-Id: I59d0603f581034adc1607d69828c3c05c4051540

Former-commit-id: baf64e4a41 [formerly 8f71be817f] [formerly 2be9c89722] [formerly baf64e4a41 [formerly 8f71be817f] [formerly 2be9c89722] [formerly 58a9434254 [formerly 2be9c89722 [formerly 848a7c7428a42fe164312363c4eb3e4080d90d66]]]]
Former-commit-id: 58a9434254
Former-commit-id: afdac2bafd [formerly d4b6c9803e] [formerly a3d17e4f46d08b2176b5ac7766da43408244c04f [formerly a82e71702a]]
Former-commit-id: bf26c0317b05796c264b1626da690d41db48f07c [formerly 0bfa8347a4]
Former-commit-id: adc1a6df6d
2014-06-26 17:30:22 -05:00
Matt Nash
df343be782 Omaha #3170 get accum value from multiple times if they are requested in FFMP geometry factory
Change-Id: Ia7759a942ec078ec5ce72b6c0007629e263d8a4a

Former-commit-id: 9c6536eba1 [formerly 52f70f50f6] [formerly 983c2c71e0] [formerly 9c6536eba1 [formerly 52f70f50f6] [formerly 983c2c71e0] [formerly f31bf67cca [formerly 983c2c71e0 [formerly 2f027b86244a3080a62c02cc816dcdca59e4538f]]]]
Former-commit-id: f31bf67cca
Former-commit-id: 0107d3a07f [formerly cd19ad85ae] [formerly 37871e06c2f6a662d3403d7c9c96b24f4d1b1b62 [formerly d4609b08d9]]
Former-commit-id: 10f941c9830d7d3062d9e3c5f8004c6036e380f5 [formerly 1be462cc91]
Former-commit-id: 695085f892
2014-06-26 17:26:06 -05:00
Nate Jensen
45fe5554a6 Merge "Omaha #3096 fix DataTime to match the Python version" into omaha_14.4.1
Former-commit-id: 6690f4ba86 [formerly b73b65af0e] [formerly 4ed4ed2e28] [formerly 6690f4ba86 [formerly b73b65af0e] [formerly 4ed4ed2e28] [formerly 37b42c05cb [formerly 4ed4ed2e28 [formerly 8ba50134638d4687cc654220e683e916eb0cea4b]]]]
Former-commit-id: 37b42c05cb
Former-commit-id: dac6a7cbf6 [formerly 7c9b95eda5] [formerly 883365f818c0d46d84ba5c5a31320258eb78ac81 [formerly 62228388e3]]
Former-commit-id: 1e9cff84911105a7c3c965c039166bf9a544ae37 [formerly 609b7716c7]
Former-commit-id: dcd81e8743
2014-06-26 16:47:39 -05:00
Nate Jensen
f6d1119040 Merge "Omaha #3236 thin client pref page supports proxy server as text or combo field" into omaha_14.4.1
Former-commit-id: 8e716b3d95 [formerly 59ab35e889] [formerly 024bc29e10] [formerly 8e716b3d95 [formerly 59ab35e889] [formerly 024bc29e10] [formerly 1f6df7f52f [formerly 024bc29e10 [formerly 40a9f54b7354de60eaf2b94d10615b2d6ad0720f]]]]
Former-commit-id: 1f6df7f52f
Former-commit-id: c2b644f4f0 [formerly 0c9596bff8] [formerly 6a3f1ad5122f1bb80c5298f408960868796a628e [formerly 96a065399e]]
Former-commit-id: 893c04d3b75c57a7f1ad2ecd752ed991d4b222ed [formerly 58791a046a]
Former-commit-id: 329f14de63
2014-06-26 15:26:21 -05:00
Matt Nash
efcddf5b25 Omaha #3096 fix DataTime to match the Python version
Former-commit-id: fef75e5df3 [formerly 91720a1420] [formerly e32adf1ee4] [formerly fef75e5df3 [formerly 91720a1420] [formerly e32adf1ee4] [formerly 407ac96c93 [formerly e32adf1ee4 [formerly d7e4329d0d9decf946b463bf40c64f4e968c871f]]]]
Former-commit-id: 407ac96c93
Former-commit-id: 3b1e9965c0 [formerly 3371a2ec19] [formerly 470503794805b493b6dd202632be51f643df3dd8 [formerly 6f0d089999]]
Former-commit-id: 6986b0ee8fea61504bf584d464f98aa78c791008 [formerly 7b84f3ba22]
Former-commit-id: e721e52498
2014-06-26 15:12:39 -05:00
Nate Jensen
db86c797a0 Omaha #3236 thin client pref page supports proxy server as text or combo
field

Change-Id: I7514d27a9b404e1c33cb6f7292475ff99bed4de0

Former-commit-id: 6bb1046927 [formerly e5c3c32bcb] [formerly f4c1691c8d] [formerly 6bb1046927 [formerly e5c3c32bcb] [formerly f4c1691c8d] [formerly 061482b015 [formerly f4c1691c8d [formerly 1a9433a524e5b8267fc3303db0763ac4685ec46d]]]]
Former-commit-id: 061482b015
Former-commit-id: c42d328429 [formerly dc99cf6c15] [formerly bc9de07f4e93861a5ad39757d852e64ad9f15a41 [formerly 40a3c0a372]]
Former-commit-id: 2dc074be3b70d9267c463e477fa249d6759b4dc6 [formerly 392ddd5ce0]
Former-commit-id: f957dd8e18
2014-06-26 15:06:38 -05:00
Slav Korolev
594c28c023 Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
Former-commit-id: ec134c82d1 [formerly 41e8e36b8d] [formerly 900d5e8fbe] [formerly ec134c82d1 [formerly 41e8e36b8d] [formerly 900d5e8fbe] [formerly 79f2c0efc6 [formerly 900d5e8fbe [formerly 4dc7f664a3e96a43392eee011bd453310d8e12ab]]]]
Former-commit-id: 79f2c0efc6
Former-commit-id: af6e5d0d24 [formerly 90ad46ac58] [formerly 0779b5b65e56e3aca2f1181750d2562c333a3f3a [formerly 3b9ed35eb0]]
Former-commit-id: 7d40d99d01e0c2d54fed5e98555f22bfcfe5f213 [formerly 0a006483ae]
Former-commit-id: 81ae177c42
2014-06-26 14:04:34 -04:00
Richard Peter
90490d0cf2 Merge "Omaha #3230 Add URMA." into omaha_14.4.1
Former-commit-id: a17eafc061 [formerly f0cb9ef34a] [formerly ed3b869bab] [formerly a17eafc061 [formerly f0cb9ef34a] [formerly ed3b869bab] [formerly f1823e07a2 [formerly ed3b869bab [formerly 63c45abb10f633f5a088e7e4834595f4c6b5e11d]]]]
Former-commit-id: f1823e07a2
Former-commit-id: de0b9ea797 [formerly 68ed668395] [formerly f980cdf63c337c00424c841b90ca34f453836401 [formerly aa33cb51d1]]
Former-commit-id: 68dcf6b4dad156ae03400f4d87f9e111afd5ea38 [formerly 2959cca1ea]
Former-commit-id: 1f1975bd3a
2014-06-26 12:30:15 -05:00
Greg Armendariz
91e1bcf9b2 Omaha #3309 - Remove reference to slf4j-log4j library
Change-Id: Ib68dfa51f5240e52325f43865aa885cb3dff04e2

Former-commit-id: f391c4c4a9 [formerly 58f93a0ecf] [formerly 7764f65707] [formerly f391c4c4a9 [formerly 58f93a0ecf] [formerly 7764f65707] [formerly 58158a9e73 [formerly 7764f65707 [formerly 2b2133b9d38453848c6f014704b7625668bcd980]]]]
Former-commit-id: 58158a9e73
Former-commit-id: 7b3b30fd88 [formerly 91357204db] [formerly 4da0ef882938a79525fd990f4df125fa4cf0480a [formerly 0fa9ec49a0]]
Former-commit-id: 28da2fa135a4d51e0cf2db6822db78163cfae090 [formerly 8389d99db2]
Former-commit-id: bff7c674d0
2014-06-26 11:34:47 -05:00
Roger Ferrel
f0a6f0841f Omaha #3230 Add URMA.
Change-Id: Iba46e07d2ff96029ae560b1232d3610b326d70df

Former-commit-id: 75e0d18dc9 [formerly 32ae3ba73f] [formerly bd2d40faee] [formerly 75e0d18dc9 [formerly 32ae3ba73f] [formerly bd2d40faee] [formerly ad6eac6e20 [formerly bd2d40faee [formerly c6abaff91bc493c9a40e39a66afd2b2262697343]]]]
Former-commit-id: ad6eac6e20
Former-commit-id: c6e2725ccb [formerly 6e37a43757] [formerly bfed3ce96674059d15316bcc9f04471a2469b25b [formerly 801bdc8fc7]]
Former-commit-id: 2e59e5b070ee1cbe0348eca7fc85285c2835dcc9 [formerly 7fef8ed924]
Former-commit-id: f954d93c5a
2014-06-26 11:16:09 -05:00
Richard Peter
58871a99e0 Omaha #3277 Update smart init launcher to allow additional threads.
Change-Id: I118d905823bd8304f0e5ea2087a16d3d8ee075ce

Former-commit-id: d4f5554728 [formerly ae1fd15ab4] [formerly 584b7576af] [formerly d4f5554728 [formerly ae1fd15ab4] [formerly 584b7576af] [formerly 8eb0b62db8 [formerly 584b7576af [formerly 475cb088596a89e3bd2818196e2f2e250930a95c]]]]
Former-commit-id: 8eb0b62db8
Former-commit-id: 4b4094d767 [formerly 33f9c041c2] [formerly 87e19fd6d53078b6086faaaaa0ee3b97d4a3bc83 [formerly 364c886659]]
Former-commit-id: f4ad553d52750d2b97f606765a5f013971cb2f7e [formerly 7cd25f23df]
Former-commit-id: 84531eabe4
2014-06-26 10:27:33 -05:00
Dave Hladky
7f50a52e38 Omaha #3273 Remove all reference off DD env variables from setup.env
Former-commit-id: b2c4c45dfa [formerly b9c930dd14] [formerly f2b4bcfef1] [formerly b2c4c45dfa [formerly b9c930dd14] [formerly f2b4bcfef1] [formerly dbf301b8c4 [formerly f2b4bcfef1 [formerly 0ad525e949fc9cf9390909128b4c590034f00963]]]]
Former-commit-id: dbf301b8c4
Former-commit-id: 9616a1ead4 [formerly 537a57784c] [formerly af3e7b05edf281db9e4c4e81a161457a1fb02a45 [formerly bc75b00731]]
Former-commit-id: 42e35eebb65f22f6ce24246028d85733bd9572f0 [formerly f67bd17c03]
Former-commit-id: dce9962e54
2014-06-26 09:46:31 -05:00
Nate Jensen
0ed2d30618 Merge "Omaha #3165 remove dead code from uengine" into omaha_14.4.1
Former-commit-id: a4360efa2b [formerly 3d93d09abb] [formerly f080f470d3] [formerly a4360efa2b [formerly 3d93d09abb] [formerly f080f470d3] [formerly 17a0af6054 [formerly f080f470d3 [formerly 90641cbc7f84e7c99252870f84f653f853653d2e]]]]
Former-commit-id: 17a0af6054
Former-commit-id: 008123b302 [formerly 7852f186f1] [formerly ab1b6975c043866c731f32c1fade1388bab6410f [formerly 2efe126e74]]
Former-commit-id: d8bc6a15bb4f1ebd2e6db2305f49b890dd776d46 [formerly b2b2750765]
Former-commit-id: 66e045138a
2014-06-26 08:42:44 -05:00
Greg Armendariz
176b7f7faa Merge "Omaha #3275 - moving developer tools to separate repository" into omaha_14.4.1
Former-commit-id: 464197a36f [formerly 11c275d9e7] [formerly 4ca605424b] [formerly 464197a36f [formerly 11c275d9e7] [formerly 4ca605424b] [formerly bda30b30fa [formerly 4ca605424b [formerly 08e67f103d58dbc0af31096bc35a3b7ef4e35783]]]]
Former-commit-id: bda30b30fa
Former-commit-id: 4491352c70 [formerly 5d8eeebe95] [formerly b5e10dc58fac449dd98006cbf9e57407427e4d67 [formerly 85a69a270a]]
Former-commit-id: 92c91b1b6a4f4bba7e0b24e730a8847a7dfb1f0d [formerly caffbc2a7c]
Former-commit-id: 37e6f55621
2014-06-25 18:13:49 -05:00
Richard Peter
771e4f3c2f Merge "Omaha #3306 Made DPA SSL comms work Change-Id: I4ef3086f4abadf35c910386c823c914c7892156d" into omaha_14.4.1
Former-commit-id: e0cc2c0caf [formerly fcb9c0a103] [formerly aab371b6ab] [formerly e0cc2c0caf [formerly fcb9c0a103] [formerly aab371b6ab] [formerly bfb242f55c [formerly aab371b6ab [formerly 7ce53f801d18c63d19e8679915fbefd341a3c804]]]]
Former-commit-id: bfb242f55c
Former-commit-id: 5f7f963f2d [formerly f85e08ff51] [formerly 753a75667f4d6512fa68f812022ce4105bd494a1 [formerly 0bd5a2b347]]
Former-commit-id: 5be2fa89dece1869d09d417b4a516c7ee3fddc1e [formerly 664a93b494]
Former-commit-id: 2150e9c03e
2014-06-25 17:26:24 -05:00
Nate Jensen
680a0bd09b Omaha #3165 remove dead code from uengine
Change-Id: Id47a5c3ef95d606270f235b1c17c1abfa0919b08

Former-commit-id: 640a17e34b [formerly 631c28cd53] [formerly b1216dd31b] [formerly 640a17e34b [formerly 631c28cd53] [formerly b1216dd31b] [formerly 4718ca6614 [formerly b1216dd31b [formerly ba4fed408842df8bf1cbfd46c467cbd58aed49bd]]]]
Former-commit-id: 4718ca6614
Former-commit-id: abdeeb4386 [formerly 2324117d9e] [formerly b771b96b458014945aaf3007e4fe87745a06f2a0 [formerly 6bdf7ce79a]]
Former-commit-id: e2b62f41f985d5befffdedd0ca07025a41f15e2c [formerly 66fae8e672]
Former-commit-id: 62137c0650
2014-06-25 16:59:07 -05:00
Steve Harris
cd12b341e6 Omaha #3275 - moving developer tools to separate repository
Former-commit-id: 875e655efd [formerly 6c0a7da2a0] [formerly 5fd1555ff9] [formerly 875e655efd [formerly 6c0a7da2a0] [formerly 5fd1555ff9] [formerly 436ce72db9 [formerly 5fd1555ff9 [formerly da96ff215e03ffdad7e7d157f6f5539663ad47ce]]]]
Former-commit-id: 436ce72db9
Former-commit-id: 439a09df83 [formerly 548f6ff8e6] [formerly 43052df1a090554b337edec3191a295aba040fad [formerly 6e2d34ae96]]
Former-commit-id: 1f1978ff4bc757040d0eca952b39dbd32d087713 [formerly 5e80a12a32]
Former-commit-id: e0abad27a0
2014-06-25 16:16:03 -05:00
Nate Jensen
66ab17a9a8 Merge "Omaha #3236 thin client connectivity dialog remembers past proxy servers" into omaha_14.4.1
Former-commit-id: 42495a5551 [formerly 7b44d8ad2d] [formerly 589f74f6d8] [formerly 42495a5551 [formerly 7b44d8ad2d] [formerly 589f74f6d8] [formerly 49a592b19f [formerly 589f74f6d8 [formerly 3d352136996875ff1e66b9e41244d53e16a1b2c3]]]]
Former-commit-id: 49a592b19f
Former-commit-id: 78ccc8922c [formerly c73138b29e] [formerly 07db96ba799a55bc88db475276f8fed8e524ee12 [formerly 2b3f7f02e5]]
Former-commit-id: d8b0dddfe938e999c3a69db10cfa3c66ec3973ba [formerly e5c63a67ac]
Former-commit-id: 30d4d8fe27
2014-06-25 12:07:28 -05:00
Ben Steffensmeier
a91e213b4f Omaha #3164 Disable compression on server error 500.
Former-commit-id: feeef994a9 [formerly 7df0be0722] [formerly d7cdfa655d] [formerly feeef994a9 [formerly 7df0be0722] [formerly d7cdfa655d] [formerly 120e9099e4 [formerly d7cdfa655d [formerly 7b3f6fe3b0d1bf8011d1cfea2937c39e33d4f81e]]]]
Former-commit-id: 120e9099e4
Former-commit-id: 20bc155506 [formerly 93ecdeeb08] [formerly f94c53315410df314a83f5e6e963796cd9ddd49e [formerly 8ea38a01a3]]
Former-commit-id: e096e7a2d40227945e7fb1d2a3c83b5cfaa9f584 [formerly 05ad65e8a0]
Former-commit-id: c0b839ce78
2014-06-25 11:13:39 -05:00