Commit graph

7489 commits

Author SHA1 Message Date
David Lovely
ffe9e6a027 Omaha #3957 Fixed path in Installer.edex-environment for QPID.
Change-Id: I846d0793c646a2e6321ed74ab672f70407ff13ac

Former-commit-id: 46093ce896 [formerly 2771afe7f4] [formerly 63c3631559] [formerly 46093ce896 [formerly 2771afe7f4] [formerly 63c3631559] [formerly 0b7ee2dc08 [formerly 63c3631559 [formerly 8107830bf2fa384c3bbe9472801c89a2a43990a3]]]]
Former-commit-id: 0b7ee2dc08
Former-commit-id: cb81f4322d [formerly 0fa33b0e84] [formerly 3887066e9acf5bcc504692fb690047a9c7d85c77 [formerly f75e17f79e]]
Former-commit-id: 2cbd5b7fba4be5ea1be867bdd5680394153dd6a0 [formerly 49e435ede3]
Former-commit-id: 55fbb2ad86
2015-01-14 14:40:36 -06:00
Nate Jensen
c59dfca9cc Merge "Omaha #3709 unify collaboration color management" into omaha_14.4.1
Former-commit-id: 3c53cb0fe7 [formerly 956845266c] [formerly bdb58ec755] [formerly 3c53cb0fe7 [formerly 956845266c] [formerly bdb58ec755] [formerly 7c61d2c06d [formerly bdb58ec755 [formerly fa93fe561ae1ad49979ab657b4a537dc7731af8e]]]]
Former-commit-id: 7c61d2c06d
Former-commit-id: 1e47902d87 [formerly fa79e80782] [formerly 9bc5273cc25fd33471a9c6370f9bb759460886bf [formerly 4abf2a8a6c]]
Former-commit-id: a9845d89c493e6e77fcdc9ddeca8f8442e9b6811 [formerly 4837ead714]
Former-commit-id: b86874003f
2015-01-14 14:05:18 -06:00
Brian Clements
8ae1e07cff Omaha #3709 unify collaboration color management
group chat session colors controlled by session color manager
color config persistence moved to utility
shared display uses same action to change colors as other sessions

Change-Id: I8ba4a3fb4842e3f96f05ee6d16b7e81e9567f6d7

Former-commit-id: 38aa18a7e0 [formerly 17ccb3ab66] [formerly 1c2d8e01d0] [formerly 38aa18a7e0 [formerly 17ccb3ab66] [formerly 1c2d8e01d0] [formerly 8cc1aa9f33 [formerly 1c2d8e01d0 [formerly c0cd560fb1b6e8c04047c0d7b7d407e9072f0cec]]]]
Former-commit-id: 8cc1aa9f33
Former-commit-id: 33bff8c047 [formerly ba13ccb6f0] [formerly c9bad25f0e0bc3619a4fc5e17fdff45892307a53 [formerly 9a87cf77c5]]
Former-commit-id: 12c0265674271e2a5c6840f97cac1f49816d7a87 [formerly 61b3b6389e]
Former-commit-id: 0f521bee60
2015-01-14 13:00:25 -06:00
Greg Armendariz
1408154892 Merge "Omaha #3957 Fixed path in Installer.edex-environment for QPID." into omaha_14.4.1
Former-commit-id: 5e8275c249 [formerly 6bdaf0b924] [formerly 6c7e615de5] [formerly 5e8275c249 [formerly 6bdaf0b924] [formerly 6c7e615de5] [formerly 0431783330 [formerly 6c7e615de5 [formerly 7c37c3ef1e9822a988f2f3aff9e884fbe48dce9c]]]]
Former-commit-id: 0431783330
Former-commit-id: 37317346ca [formerly afe39c3dd6] [formerly 8b473ced856efdd5b45e4fb63e4bc182021ff577 [formerly fff75342eb]]
Former-commit-id: c441899dcfcba06add4edc5696368ccdb04ea756 [formerly 89c4169e18]
Former-commit-id: c7552ebaf9
2015-01-14 11:33:29 -06:00
David Lovely
cc021bb799 Omaha #3957 Fixed path in Installer.edex-environment for QPID.
Change-Id: I22eea04180974e6d3cbcfb4fc4a2e18fe7823db9

Former-commit-id: df92459c77 [formerly e4dbe403b3] [formerly cc50c7a0452ba647d5b6073d1d42a91e4225e2d1 [formerly 9b9d569062]] [formerly df92459c77 [formerly e4dbe403b3] [formerly cc50c7a0452ba647d5b6073d1d42a91e4225e2d1 [formerly 9b9d569062]] [formerly f75230366c [formerly 9b9d569062 [formerly 34faf643b5de3c01713e0129209efb4ccc2c2aa0]]]]
Former-commit-id: f75230366c
Former-commit-id: aafad06d27 [formerly e8150e977c] [formerly 1d6b91d11911a6b3ab28c054698c6b1b384a7605 [formerly 5bbea995ae]]
Former-commit-id: c967e5feace797303c2cf127e0ad4741c5a04934 [formerly 9316cbc4a4]
Former-commit-id: 4467128c35
2015-01-14 11:28:56 -06:00
Ben Steffensmeier
4f11df8c5a Omaha #3966 Limit the number of flags on wind barbs.
Former-commit-id: f1aadfd1be [formerly dad3e9ed8c] [formerly 22f13c9f08] [formerly f1aadfd1be [formerly dad3e9ed8c] [formerly 22f13c9f08] [formerly 3a6bce1100 [formerly 22f13c9f08 [formerly 8b0ce01043b4ba2858dacb5ceeb41299f5c2044d]]]]
Former-commit-id: 3a6bce1100
Former-commit-id: f54ba922fc [formerly f7d8dae6b9] [formerly 6e46f5ca1f27bbfd2affbcd77eca893a08d09a48 [formerly 7d9ff47dfa]]
Former-commit-id: 5d2c5c2a402c7cc6c52b10342882d75fca379f34 [formerly 4b253097a1]
Former-commit-id: 79d0ce0b70
2015-01-13 17:21:43 -06:00
Ron Anderson
55468188a6 Omaha #3997 Create script for sites to use to compare AreaDictionary.py files
Change-Id: I0b76c40ffe70d1df9d9379deca4bdc0276a723fd

Former-commit-id: bdc4d332f1 [formerly d4ccf1c538] [formerly ce0fa19f7b] [formerly bdc4d332f1 [formerly d4ccf1c538] [formerly ce0fa19f7b] [formerly b8fdaf17a4 [formerly ce0fa19f7b [formerly 23b10f94f9ff892fdbff654e6fefbd4b3c914f58]]]]
Former-commit-id: b8fdaf17a4
Former-commit-id: 1f0797db65 [formerly 4919681992] [formerly 1a179dd43ba317d374f180d368cd3583557a3918 [formerly b5f578a4e1]]
Former-commit-id: 1daba82d5e08e2886250d83dbc318ac6330cb688 [formerly a8d2a64bd7]
Former-commit-id: 9b9d487ad6
2015-01-13 15:11:42 -06:00
Ron Anderson
e14a3d36bb Omaha #3997 Create delta script to preserve the site's current AreaDictionary.py file
Change-Id: Id38826c171ed6d87fd8b677c53df7e2a6b49254c

Former-commit-id: 096a93a4bb [formerly 699573558f] [formerly 690861d350] [formerly 096a93a4bb [formerly 699573558f] [formerly 690861d350] [formerly 82aa416c48 [formerly 690861d350 [formerly 9da286a579c582db47d63aba83552f5361d819e0]]]]
Former-commit-id: 82aa416c48
Former-commit-id: 0a55b5fbbd [formerly 7aaaf55ea8] [formerly a7ca0a1c9d42345e31261442621f895c62e6b26a [formerly ac7a6945f8]]
Former-commit-id: 47ad7f3c08eaaeeeb5a2b79b4f7d1b244a39aef8 [formerly 4af148d7f0]
Former-commit-id: a04c7694d0
2015-01-13 14:32:50 -06:00
cmadmin
767f41d351 Merge "Omaha #3957 Moved QPID to build repository directory structure." into omaha_14.4.1
Former-commit-id: 88c6cad829 [formerly b9fac8ae47] [formerly 5b796ff2f8] [formerly 88c6cad829 [formerly b9fac8ae47] [formerly 5b796ff2f8] [formerly 478e3825ae [formerly 5b796ff2f8 [formerly 455b763fd46e6053e272854e89074cdb898d4a6c]]]]
Former-commit-id: 478e3825ae
Former-commit-id: 196aba3c92 [formerly 8d5cd7a6d6] [formerly 9b043cae2b087a4fc9989607717d53d30c55ed9c [formerly b5c3233880]]
Former-commit-id: c3ef88677e3904f2c16a4088d47259b7f4567a66 [formerly 4e04d6093e]
Former-commit-id: c95f832d12
2015-01-13 09:14:43 -06:00
Nate Jensen
0f564af508 Merge "Omaha #3709 reworked custom user color configuration" into omaha_14.4.1
Former-commit-id: 22ecd81209 [formerly bb5b975ae0] [formerly 65a0433605] [formerly 22ecd81209 [formerly bb5b975ae0] [formerly 65a0433605] [formerly 511ba87c5c [formerly 65a0433605 [formerly d7cc45aa26f71ad81d82dc1dfa2541e105b4c76c]]]]
Former-commit-id: 511ba87c5c
Former-commit-id: 4cb599d378 [formerly 7d2f617c95] [formerly 7d8802c27365739adc62402e7523a0d85267b719 [formerly a9e4546f6a]]
Former-commit-id: b24a418f20ae479fa9115844f15bb7b9976ab4dd [formerly e75e025fe4]
Former-commit-id: 2ab1455029
2015-01-12 13:59:25 -06:00
Slav Korolev
5a3799377c Omaha #3220 - Replaced MonitoringArea class with individual area configuration managers.
Former-commit-id: ec08386cc4 [formerly f08d184cfc] [formerly 9c57dab437] [formerly ec08386cc4 [formerly f08d184cfc] [formerly 9c57dab437] [formerly b8ab18d3e1 [formerly 9c57dab437 [formerly 00fd20d76a4ea46e9806bad11b1bc5a2acc42d6e]]]]
Former-commit-id: b8ab18d3e1
Former-commit-id: e32ce19793 [formerly 6c73aca047] [formerly 7708df916bb5d9655f804071f169d05bf3fc2cdd [formerly 790a79e752]]
Former-commit-id: 35811ae4e1a7864d41803b014c3710a123669284 [formerly a6e0502c58]
Former-commit-id: 7c7c14b192
2015-01-12 14:32:31 -05:00
Brian Clements
4d6164a5d9 Omaha #3709 reworked custom user color configuration
Change-Id: I8b69dc378976684e989cae883e99ade9553c04d3

Former-commit-id: 63041f1980 [formerly 911b007d95] [formerly 3d33ce1341] [formerly 63041f1980 [formerly 911b007d95] [formerly 3d33ce1341] [formerly 46c0d7d42c [formerly 3d33ce1341 [formerly 18825c076fe273c9ae2e8040ccea2de0698b2877]]]]
Former-commit-id: 46c0d7d42c
Former-commit-id: 9fa2a180a6 [formerly 42d54b3dac] [formerly 8ae511fba05ed958557137bebb35ff2c00ef6fd0 [formerly c354fa93db]]
Former-commit-id: a5cc2985790b3e7e88f555a7afbfc86e58dd80f9 [formerly 29ec52418c]
Former-commit-id: d577a1d181
2015-01-12 11:06:57 -06:00
Nate Jensen
4a1eccbab5 Merge "Omaha #3918 Fix for standalone clients not starting due to central registry non-existance. Change-Id: I78ed5dd75e94d567d934acfae098d59364a62292" into omaha_14.4.1
Former-commit-id: 014c30ad96 [formerly c37ffcde90] [formerly 44f0f7aafc] [formerly 014c30ad96 [formerly c37ffcde90] [formerly 44f0f7aafc] [formerly 06054344dd [formerly 44f0f7aafc [formerly 5fc926b7e735f2c92b16a85a7ba5f663a443ea53]]]]
Former-commit-id: 06054344dd
Former-commit-id: 2a8197d2c6 [formerly ba3b185a4d] [formerly 11ef8278d6478c02945c4f7d12ea9f44b42b1bf2 [formerly cf448004b9]]
Former-commit-id: cbf383660fc1f71adde8f593f913bafd92249dcf [formerly 3d3f683ba5]
Former-commit-id: 07013d200f
2015-01-12 09:22:30 -06:00
David Lovely
0dba443423 Omaha #3957 Moved QPID to build repository directory structure.
Change-Id: Idee474cb4dd3d9366acfad941bedcf3c999be084

Former-commit-id: d25fcc9155 [formerly 208dd5de01] [formerly 240927c241] [formerly d25fcc9155 [formerly 208dd5de01] [formerly 240927c241] [formerly e56002debf [formerly 240927c241 [formerly f27b0c6b92b4c744493e44b510defe3d650ca1f6]]]]
Former-commit-id: e56002debf
Former-commit-id: cc40ff8301 [formerly 9f09af1c8a] [formerly b42af842cf64f96a786847d263d90f2eab6ef2ca [formerly d860af2218]]
Former-commit-id: ba931f8d29a5e299b40d1de07af37d22f7100e4b [formerly b67b97803c]
Former-commit-id: 9c401ce4ea
2015-01-07 12:03:10 -06:00
Slav Korolev
6f00a3a43c Omaha #3937 - Removed UELE - Index out of bounds.
Former-commit-id: f8dd337ebb [formerly 13ef257a0d] [formerly e30255308829f00ef8e279a7739ec39926b221ba [formerly c215b4c91b]] [formerly f8dd337ebb [formerly 13ef257a0d] [formerly e30255308829f00ef8e279a7739ec39926b221ba [formerly c215b4c91b]] [formerly da0d46ad81 [formerly c215b4c91b [formerly 039a382cf7a891cecdc7bbb1b0b5d83e02a7df13]]]]
Former-commit-id: da0d46ad81
Former-commit-id: 829b40e864 [formerly a9f642af5b] [formerly a19ec9f110f50b444e205b810d327de71cac6d1a [formerly 32b5dc8928]]
Former-commit-id: fb4b7078c421a89f7f91a815350ebf703c052914 [formerly 44a4f7220d]
Former-commit-id: cb5037ba90
2015-01-07 12:20:08 -05:00
Dave Hladky
2632f596c3 Omaha #3918 Fix for standalone clients not starting due to central registry non-existance.
Change-Id: I78ed5dd75e94d567d934acfae098d59364a62292

Former-commit-id: a223529e47 [formerly c6aca09cf3] [formerly 66aa4b2fbf] [formerly a223529e47 [formerly c6aca09cf3] [formerly 66aa4b2fbf] [formerly 36ab95205f [formerly 66aa4b2fbf [formerly d8a52577bbe13f53f9afbbae354e8bc58e11a0ed]]]]
Former-commit-id: 36ab95205f
Former-commit-id: f947dbee15 [formerly 87aeba1177] [formerly 47f3e80abb64b345be5144758283db23638433af [formerly f8214a64cd]]
Former-commit-id: 9a83ef88947c86e150c5679b1285768e861465ce [formerly a32499a14a]
Former-commit-id: c038b51e8e
2015-01-06 14:37:01 -06:00
Brian Clements
3e6e038aa3 Omaha #2707 replaced LSR officeId constraint with stationId
Change-Id: I05fef0c56801fa907e45da3400437e71ce0e38dd

Former-commit-id: cbc8c0d72d [formerly 111c81d35c] [formerly acc9e8630d] [formerly cbc8c0d72d [formerly 111c81d35c] [formerly acc9e8630d] [formerly ac952bc760 [formerly acc9e8630d [formerly e0cd69f020d351f0aaefd5b35ffb369e44a04e48]]]]
Former-commit-id: ac952bc760
Former-commit-id: cdcb5b287b [formerly 877190a87f] [formerly 5540488375a5b61809fc3517ad4f496e1a5b43d3 [formerly 0d29964efc]]
Former-commit-id: cd9473b86c8a2ff84badf489f7877a46d00e7ca5 [formerly 0a0547b474]
Former-commit-id: 3ec63f55b8
2015-01-06 12:33:06 -06:00
Nate Jensen
443ff48439 Merge "Omaha #3709 Fix some minor issues with collaboration colors." into omaha_14.4.1
Former-commit-id: 0dfbe0f468 [formerly 5ea76c4f3d] [formerly 33229e2871] [formerly 0dfbe0f468 [formerly 5ea76c4f3d] [formerly 33229e2871] [formerly b8f1475a3c [formerly 33229e2871 [formerly d617935ead64cdaf51481aa46fc0bf2e07215696]]]]
Former-commit-id: b8f1475a3c
Former-commit-id: 92822f6fdb [formerly fae5ed4e5f] [formerly 635c7102ca79503a7a04a313d380b472571a4a1f [formerly 4a547884b5]]
Former-commit-id: 27ac421263a07d5b34de5c810c16fd2c2391ed47 [formerly f5db894b86]
Former-commit-id: fb038b5f9e
2015-01-05 13:06:21 -06:00
Mark Peters
399f4943ff Omaha #3709 Fix some minor issues with collaboration colors.
Change-Id: I07fbcd6db21c3ee3b5fa404ad1c004af7e3ac057

Former-commit-id: bdb8c848dd [formerly 6df0145869] [formerly 530b52d7db] [formerly bdb8c848dd [formerly 6df0145869] [formerly 530b52d7db] [formerly 7cc21da419 [formerly 530b52d7db [formerly f028c5040e50d3a2c96294d5c4d7ddd0e360defb]]]]
Former-commit-id: 7cc21da419
Former-commit-id: 3db765ceae [formerly 3ff2238ced] [formerly f27de8dbf1538562ed370cc4808ac82abc85722d [formerly 75bc5c4ed9]]
Former-commit-id: 4fe9a88e9be015dffe043eac1a6573e3da7402b2 [formerly 308d4aa4a5]
Former-commit-id: aa4db73f94
2015-01-05 12:57:42 -06:00
Richard Peter
c3f7bbddeb Merge "Omaha #3600 Implement getAvailableLevels() for radar to increase inventory performance." into omaha_14.4.1
Former-commit-id: a6991f3d88 [formerly 341197be92] [formerly 38f1ef0e8f] [formerly a6991f3d88 [formerly 341197be92] [formerly 38f1ef0e8f] [formerly be845aea5f [formerly 38f1ef0e8f [formerly 429f7038e0342ccc1673e85c40cbc1f011a70410]]]]
Former-commit-id: be845aea5f
Former-commit-id: 95c78fdce2 [formerly 53e41d4d5a] [formerly f6e35cfb07c6fd3f3742bd6df61b743dafe8ec2c [formerly 8a2358f46a]]
Former-commit-id: 3962bc0df31bcecf65857b65193ac2328639d6a2 [formerly f99847bfea]
Former-commit-id: 59a72b39ec
2015-01-05 11:35:04 -06:00
Slav Korolev
af107750ad Omaha #3841 - Corrected updateZones method.
Former-commit-id: 81791694e9 [formerly 01d004673d] [formerly 191399cdd11fdf30673c2de06971c1283a03f642 [formerly 24322ed6ca]] [formerly 81791694e9 [formerly 01d004673d] [formerly 191399cdd11fdf30673c2de06971c1283a03f642 [formerly 24322ed6ca]] [formerly 6ebe11d430 [formerly 24322ed6ca [formerly 4d133cc367ab016b378ada534cff0fcda579e323]]]]
Former-commit-id: 6ebe11d430
Former-commit-id: c1150b5a91 [formerly 551c21697b] [formerly c55d79e8f22e2c250090ae443eb46fd52a568b8d [formerly a444487899]]
Former-commit-id: e8d1bc09db23dc6c547ad19290971db4ae7f245c [formerly 33ac001044]
Former-commit-id: 6da982ef53
2014-12-19 13:27:07 -05:00
Nathan Bowler
f56a20c3c4 Omaha #3600 Implement getAvailableLevels() for radar to increase inventory performance.
Change-Id: I168bd135ae3ddd386761bb87b9160eb97f718642

Former-commit-id: 1f4c329495 [formerly f7acda4f6a] [formerly 863ac95fef] [formerly 1f4c329495 [formerly f7acda4f6a] [formerly 863ac95fef] [formerly a674630b92 [formerly 863ac95fef [formerly 6f9709b43d307494dfa702030b961964ec8d2170]]]]
Former-commit-id: a674630b92
Former-commit-id: a06f1ff4d8 [formerly 1548a93675] [formerly 27d5c1578378a059fb3484843a5cfb91f8286d9c [formerly c7805340b5]]
Former-commit-id: 3f7853f4280e7fccd785d4e7defa8fe1c534a560 [formerly 7f68dff20a]
Former-commit-id: 77e1c83fbc
2014-12-19 12:56:43 -05:00
Chris Cody
ea65e44e7c Omaha #3921 Added IF EXISTS clause to table drop
Former-commit-id: d5e0af5625 [formerly 0275a894b3] [formerly bdc8b9e8c0] [formerly d5e0af5625 [formerly 0275a894b3] [formerly bdc8b9e8c0] [formerly 0966af1580 [formerly bdc8b9e8c0 [formerly 8f0c84905653b0784183debc6703ee2d0be09fa2]]]]
Former-commit-id: 0966af1580
Former-commit-id: 925ada6fd5 [formerly 21c1044350] [formerly f33a02f675de330db6909aaba2c41a2194c51a46 [formerly 44ee3b88fb]]
Former-commit-id: ee175e9eea104f1bc390ff0cd93a0194108ed251 [formerly 87c089c240]
Former-commit-id: 29db7d5234
2014-12-16 11:05:17 -06:00
Nathan Bowler
bd95005915 Omaha #3393 Fix negative k values
Change-Id: I4185fd732eeefd63187ac28f208120aadae49541

Former-commit-id: 9427a403ac [formerly a8112a7218] [formerly 785372b564] [formerly 9427a403ac [formerly a8112a7218] [formerly 785372b564] [formerly 67818d5e8f [formerly 785372b564 [formerly b280bee22564ad47981a97ab4777e8013ebb84cd]]]]
Former-commit-id: 67818d5e8f
Former-commit-id: 1a132cedcc [formerly c96ed32e94] [formerly 64e7b31e414b418568bf87b7fabd019a379c29cf [formerly 6d514deeda]]
Former-commit-id: 3bcc7ad07f557cd07a69f5125a437a95561df184 [formerly 503e45d730]
Former-commit-id: d0a9a1dfbb
2014-12-16 11:01:45 -05:00
Nathan Bowler
25675883e6 Omaha #3598 Fix grid retrieval when forecast is 0
Change-Id: I6f948f0bdd81315ba8bfce07387d745129bdc9b5

Former-commit-id: e3415fa50e [formerly 2b4fae6804] [formerly e9e3ad93b4c91f32fce3cb78b0b106e126f76f8e [formerly 46e68ffe3e]] [formerly e3415fa50e [formerly 2b4fae6804] [formerly e9e3ad93b4c91f32fce3cb78b0b106e126f76f8e [formerly 46e68ffe3e]] [formerly d60e6eca9c [formerly 46e68ffe3e [formerly 35e717a7587e34b77a8ceda182cbf8e0374a146d]]]]
Former-commit-id: d60e6eca9c
Former-commit-id: 3915f7c4eb [formerly 3693ce5f1a] [formerly ddc0c847af499876e91be75b81e74070d626bd35 [formerly d074dbc415]]
Former-commit-id: e9780036238634af8c8d0714ab65052be68f19ec [formerly e3939bbfc8]
Former-commit-id: 04994871ad
2014-12-15 16:21:45 -05:00
Richard Peter
d6f7154b86 Merge "Omaha #3921 Delta script for #3550 dataset latency" into omaha_14.4.1
Former-commit-id: 85ca1bbea3 [formerly 3797481584] [formerly 9a84bd47fd] [formerly 85ca1bbea3 [formerly 3797481584] [formerly 9a84bd47fd] [formerly eac92942fb [formerly 9a84bd47fd [formerly eb66fb0e92b4849027dfbf6f208a4b00dcc728e9]]]]
Former-commit-id: eac92942fb
Former-commit-id: 8d4200ea15 [formerly ad433fd25d] [formerly 973f7a53dfd556ba21c1a123093768b04d64cab3 [formerly 9de9e7a111]]
Former-commit-id: a7833118ea46669f061c72d21abbe56f45351441 [formerly b386d453ca]
Former-commit-id: 795f832dad
2014-12-12 16:37:39 -06:00
Lee Venable
2ecf58d664 Merge "Omaha #3709 Add icon that displays text colors next to color change menu items" into omaha_14.4.1
Former-commit-id: 5897b87e43 [formerly 24aa804855] [formerly b3b6b164ed] [formerly 5897b87e43 [formerly 24aa804855] [formerly b3b6b164ed] [formerly 6812dc291c [formerly b3b6b164ed [formerly 2baba567db90a6f3fe4f9cbf440798454d88fbaf]]]]
Former-commit-id: 6812dc291c
Former-commit-id: 72fc3c4599 [formerly f8d0f8f0c2] [formerly 4eb04a0482dc3efe199b410711aa67b95d53938b [formerly a9e77a8ee9]]
Former-commit-id: c4f083ea404a6885563d5aea967fcac6dc77c7fd [formerly be99576093]
Former-commit-id: 1078fa6bdc
2014-12-12 14:00:43 -06:00
Mark Peters
7e627ab937 Omaha #3709 Add icon that displays text colors next to color change menu items
Change-Id: I5a8fe5cc5679381587cb7b13cfa5984bf796ee42

Former-commit-id: c054291607 [formerly 5a19380c59] [formerly 7b591d8a68] [formerly c054291607 [formerly 5a19380c59] [formerly 7b591d8a68] [formerly 05eabb4a91 [formerly 7b591d8a68 [formerly ca40c8637ae75b25119864f0182cb25471d52219]]]]
Former-commit-id: 05eabb4a91
Former-commit-id: 3ce47383e7 [formerly 28218a264b] [formerly a6b666e5da6705b818b008b6d83520ec34b8d635 [formerly 1332b58355]]
Former-commit-id: 4946981e087a29d03fef26c7b3e9dc0307209c07 [formerly dad6f8b068]
Former-commit-id: 845245f1ee
2014-12-12 13:09:14 -06:00
Chris Cody
312db5bfde Omaha #3921 Delta script for #3550 dataset latency
Change-Id: I3cd0b8f5cb7679f89e75e88400ae0f26263254d8

Former-commit-id: b52cfe4463 [formerly ed696a7a64] [formerly 0e6aaed733] [formerly b52cfe4463 [formerly ed696a7a64] [formerly 0e6aaed733] [formerly 51f9ec48a2 [formerly 0e6aaed733 [formerly 266ea543bbbc8ed193f121f3fee82fa2be6c8ee6]]]]
Former-commit-id: 51f9ec48a2
Former-commit-id: 5b8da4369b [formerly 7cd194b94e] [formerly 92ee70bbcbec75932dc7e3624eaea8d033cf4d85 [formerly 05fbc4a813]]
Former-commit-id: 39f3f9be88207397dafee41b31a83c7bd90a9af0 [formerly f62f6f96cf]
Former-commit-id: c1118e2352
2014-12-12 12:36:08 -06:00
Slav Korolev
ef2d008007 Omaha #3888 - Fixed NPE error in the process() method.Corrected
Former-commit-id: cf10f6a374 [formerly c6dbb0aa95] [formerly 63014f65c7] [formerly cf10f6a374 [formerly c6dbb0aa95] [formerly 63014f65c7] [formerly ed97d72dcb [formerly 63014f65c7 [formerly 3193057c916ee8cc6f99c8d0ecc69d067fb68c16]]]]
Former-commit-id: ed97d72dcb
Former-commit-id: 25601c1cc1 [formerly 3c4f538aa2] [formerly 458e095528b9ac242b7db85e5cee6c773f0ff478 [formerly 2c423adede]]
Former-commit-id: eb9a6410cb92c4406f5cfd616b9256c7c257039c [formerly 432fb0db63]
Former-commit-id: c37b73f316
2014-12-12 12:29:03 -05:00
Lee Venable
09ec05221b Merge "Omaha #3888 - Fixed NPE error in the process() method." into omaha_14.4.1
Former-commit-id: be95d4ed2b [formerly 793cf6d676] [formerly e036b3e70e] [formerly be95d4ed2b [formerly 793cf6d676] [formerly e036b3e70e] [formerly 2bc4cfdaae [formerly e036b3e70e [formerly 04284dafa2f563224067e6a3312d69cc942e1d7d]]]]
Former-commit-id: 2bc4cfdaae
Former-commit-id: d5f092345d [formerly 899a19bbe9] [formerly 349767f8ff41d00117e2ff059f8b4a3038913c81 [formerly 219c690931]]
Former-commit-id: b55277c4a4c45dec51bb8ab1d9fe0037696634ae [formerly 42d70d1af6]
Former-commit-id: d535422219
2014-12-12 11:20:19 -06:00
Richard Peter
3683e6669c Merge branch 'omaha_14.4.1' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into omaha_14.4.1
Former-commit-id: 245ec3d100 [formerly 286cf3e921] [formerly 644a076c76] [formerly 245ec3d100 [formerly 286cf3e921] [formerly 644a076c76] [formerly 5ce93f49eb [formerly 644a076c76 [formerly 5b26ce7815295057f79a114de83e4443a5464ae4]]]]
Former-commit-id: 5ce93f49eb
Former-commit-id: 1aee946cdc [formerly 58d80d455a] [formerly 41aa1e208b9c2526de3619906e96dd6885351157 [formerly cc41ebd2e0]]
Former-commit-id: 39949e9f709801d50b0e6761d00e42271b860f0a [formerly f2babdc51a]
Former-commit-id: 087ce6633b
2014-12-12 10:57:15 -06:00
Slav Korolev
49280ce69c Omaha #3888 - Fixed NPE error in the process() method.
Former-commit-id: 9f4b0c1e83 [formerly 31ab89f85e] [formerly 4abd2fc837] [formerly 9f4b0c1e83 [formerly 31ab89f85e] [formerly 4abd2fc837] [formerly 9cf99b9e88 [formerly 4abd2fc837 [formerly 93aa24fb9f41e7bd17d9ee8594e0d0a9905e91be]]]]
Former-commit-id: 9cf99b9e88
Former-commit-id: 35eff13d0d [formerly 53cd8f73f6] [formerly adf2dc9c1b4a726f37b50102ab362aa55f9aeaec [formerly 1b5bbd269e]]
Former-commit-id: f05e5b048b0a20f1b006468414b07a8b2442b394 [formerly fc8c0afbba]
Former-commit-id: f72d5f0465
2014-12-12 11:53:59 -05:00
Richard Peter
7434f3c20e Merge tag 'OB_14.3.2-8m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
	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/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java

Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5

Former-commit-id: 20fa07c6d3 [formerly 23eafaba3d] [formerly 2457d0e6f7] [formerly 20fa07c6d3 [formerly 23eafaba3d] [formerly 2457d0e6f7] [formerly 8de1ebcb65 [formerly 2457d0e6f7 [formerly e190a710b1b9506c99120fdaa1ebfdb144fcbf6f]]]]
Former-commit-id: 8de1ebcb65
Former-commit-id: 9c162858f4 [formerly 746bbb0885] [formerly 2a8f875c3a3a12752593d61bb77d88a0341b5368 [formerly f7d8755ba9]]
Former-commit-id: 0fc5096e00ed840082ba093d3d160ad0e811a828 [formerly bf3ddbb62b]
Former-commit-id: 59e9fe78f2
2014-12-12 10:36:04 -06:00
Slav Korolev
3e8ff1cf24 Omaha #3220 - Moved refreshing of table in the UI thread.
Former-commit-id: c61f1676dc [formerly 974cc09ca5] [formerly d06882f4c9] [formerly c61f1676dc [formerly 974cc09ca5] [formerly d06882f4c9] [formerly fd3a6ea199 [formerly d06882f4c9 [formerly 7454b39e71eeca348f4f167b8aa70d6ce5253004]]]]
Former-commit-id: fd3a6ea199
Former-commit-id: 29e583dbc6 [formerly a64df60d4c] [formerly 5be1d8a4761fd052986b235098d04d3c78ce0e1d [formerly 7a115d7f58]]
Former-commit-id: 9ff45cfe65935915205b3a490913fd404180f01e [formerly 0854178325]
Former-commit-id: 264aa14206
2014-12-11 15:38:47 -05:00
Richard Peter
3e91b5e9a0 Merge "Omaha #3757 Added HTTPS flag" into omaha_14.4.1
Former-commit-id: 79c2bc3cb1 [formerly 46611ec961] [formerly f16173803c] [formerly 79c2bc3cb1 [formerly 46611ec961] [formerly f16173803c] [formerly 08734bb4e1 [formerly f16173803c [formerly dd6f035e86bbd4f9e86ce3b19b7b61c0b3947737]]]]
Former-commit-id: 08734bb4e1
Former-commit-id: da87b7e344 [formerly 2cd131629e] [formerly 299ef4e72e08baeb7ae8ec921c42a624af5ee93f [formerly 9c162af96a]]
Former-commit-id: 009f12ea29403aeb6aaa8390eefc23a236390f00 [formerly a6fff5273d]
Former-commit-id: 333701f9f9
2014-12-10 17:54:33 -06:00
Dave Hladky
c9b9e5105b Omaha #3757 Added HTTPS flag
Former-commit-id: 379ba3c51d [formerly a69c83e534] [formerly 61d25613ab] [formerly 379ba3c51d [formerly a69c83e534] [formerly 61d25613ab] [formerly 337f67b136 [formerly 61d25613ab [formerly 7848dc4df9ef8faafdce556836bc71c789b74ee4]]]]
Former-commit-id: 337f67b136
Former-commit-id: e359f2e964 [formerly 7d58dacbba] [formerly 3d9e9d54499f054222096d3dbfcee752e01f5b8e [formerly 0e15b23b5f]]
Former-commit-id: 1e4d972c847cd8896d5bc27f9670ce81727c17c3 [formerly d5280b3cae]
Former-commit-id: b0468116f5
2014-12-10 17:17:12 -06:00
Bryan Kowal
1176ffa1ad Omaha #3914 - increment yajsw release
Former-commit-id: 1249cd8a28 [formerly c2e0b33c19] [formerly aad5e554b9] [formerly 1249cd8a28 [formerly c2e0b33c19] [formerly aad5e554b9] [formerly 0b65eb314d [formerly aad5e554b9 [formerly 9a3e3a2cfdc29926e2d08c7a8e33d45f9ce5f22a]]]]
Former-commit-id: 0b65eb314d
Former-commit-id: bc57b285f3 [formerly 544c5e39eb] [formerly 6a88a0c7e0d5a026903c015567666e9ed2cdde95 [formerly 9efc72561b]]
Former-commit-id: 608ce9f326f155f2a382a4fe899e3b5510518fcb [formerly e3bad2212b]
Former-commit-id: 7279d157bb
2014-12-10 10:34:26 -06:00
Lee Venable
ab17efaace Merge "Omaha #3709 New color dialog, move P2P color actions to menu bar, add actions to contact list" into omaha_14.4.1
Former-commit-id: 5817addd8b [formerly 28540e441e] [formerly 9a4f87fe8f] [formerly 5817addd8b [formerly 28540e441e] [formerly 9a4f87fe8f] [formerly 6b346b22e0 [formerly 9a4f87fe8f [formerly d1e058cfdac1e61119308538eeaab34097f65ba2]]]]
Former-commit-id: 6b346b22e0
Former-commit-id: d9018d292b [formerly 52aca5c7ab] [formerly 4d20c9d2eee7dfb2218ac167368ed218c38b4584 [formerly 165b3fcb64]]
Former-commit-id: ae2e8cf646030b5b656a5201f00293acb1bb6cad [formerly 77d5d861f8]
Former-commit-id: d356113cec
2014-12-09 12:54:03 -06:00
Mark Peters
1be91f6cfd Omaha #3709 New color dialog, move P2P color actions to menu bar, add actions to contact list
Change-Id: Ie03659376d3a035bb2acbd98b2e34a91e6b5ad57

Former-commit-id: 9960f739c3 [formerly e1bf45baef] [formerly a721ccbcac] [formerly 9960f739c3 [formerly e1bf45baef] [formerly a721ccbcac] [formerly 1880d72b9d [formerly a721ccbcac [formerly 447437edc9b14412615ff691784fa7545146a596]]]]
Former-commit-id: 1880d72b9d
Former-commit-id: c513929ce2 [formerly 2c8f6b6132] [formerly 1be8a6eeecd0ab01d93025680c8cfb1321c89c8e [formerly dbceca27e6]]
Former-commit-id: 73c570e9041b6652a64a2a9c73ed0e0cbf6f343a [formerly 8496792ecd]
Former-commit-id: c75be31133
2014-12-09 11:47:22 -06:00
David Gillingham
ce624f01ce Omaha #3885: Fix purging of practice VTECproducts when submitted in simulated time.
Change-Id: I5c4afa6ab0faf975388a25916d6616ce9eb05098

Former-commit-id: 9cb76fd96e [formerly 02af20bcd9] [formerly a41cc32a40] [formerly 9cb76fd96e [formerly 02af20bcd9] [formerly a41cc32a40] [formerly ae5a0f55d1 [formerly a41cc32a40 [formerly 35ae2af301ec8b66a65e1564c17f6e3f8d7623d2]]]]
Former-commit-id: ae5a0f55d1
Former-commit-id: 1af96e36d1 [formerly 4ed1f30c04] [formerly 08b71952d6e6c885679d68ca5e4be1842ba7121d [formerly 877d75d520]]
Former-commit-id: 370f40656933b4002543d0bf32ffe406cc0db28c [formerly cb407d5749]
Former-commit-id: 64e7bcd723
2014-12-09 11:21:29 -06:00
Lee Venable
5c13f18110 Merge "Omaha #3873 - Fixed assigning timeObs for maritime record." into omaha_14.4.1
Former-commit-id: 464bfa2d2c [formerly d36bb7a1d3] [formerly 5cdd52f6b2] [formerly 464bfa2d2c [formerly d36bb7a1d3] [formerly 5cdd52f6b2] [formerly a60130beba [formerly 5cdd52f6b2 [formerly be1232a4e28bcd039bbe7c150932fd982212019d]]]]
Former-commit-id: a60130beba
Former-commit-id: acf0f03e8e [formerly c71cd09b83] [formerly 97d73f49b19b4335625608be7a618a5f9a36dafa [formerly e9cd246339]]
Former-commit-id: cbd1f77bce4e5297c4da8e5ca3ab170a01f4aa4e [formerly b5336562fa]
Former-commit-id: 8bc4569507
2014-12-08 12:57:54 -06:00
Nathan Bowler
11307c1200 Omaha #1231 Fix selecting AWIPS ID
Change-Id: I657d723b45b9374523307a8fdbdfc21f2f31f35e

Former-commit-id: e3727b1277 [formerly 3baaa2ea5e] [formerly c07d774bd0] [formerly e3727b1277 [formerly 3baaa2ea5e] [formerly c07d774bd0] [formerly 06c94a25b7 [formerly c07d774bd0 [formerly 68e6a2fd48a062e0ca66b52098f2781a30926a80]]]]
Former-commit-id: 06c94a25b7
Former-commit-id: ed05680a73 [formerly f72df72bc1] [formerly b356f99747191cdfb2331c93b09917c18174c8fc [formerly b25d850fbb]]
Former-commit-id: ead0941caa90a038378520c402ba5996be3f9b51 [formerly 4f917a9642]
Former-commit-id: 091648a348
2014-12-08 13:07:14 -05:00
Richard Peter
9c99827166 Merge "Omaha #3801 Fix closing cave with new/edit dialogs open, description menu when nothing is selected, and when edit/delete buttons are enabled" into omaha_14.4.1
Former-commit-id: 8fb756b68d [formerly d0c2a515e7] [formerly 628324ee3c] [formerly 8fb756b68d [formerly d0c2a515e7] [formerly 628324ee3c] [formerly 25dd53d440 [formerly 628324ee3c [formerly 59d1091dfcf6df87d0eb30e175c863556ab73d14]]]]
Former-commit-id: 25dd53d440
Former-commit-id: 5c8733a074 [formerly e846cafe51] [formerly 295eec087ce923538d4e75ca5c9fe18fee3a9575 [formerly 27b41a0550]]
Former-commit-id: d3df2f64ba9afa373e673bda2a84b458935578e8 [formerly ca376b5a92]
Former-commit-id: 74114ac482
2014-12-05 14:44:52 -06:00
Nathan Bowler
0c7c2be7d4 Omaha #3801 Fix closing cave with new/edit dialogs open, description menu when nothing is selected, and when edit/delete buttons are enabled
Change-Id: I982e959f2c4ebe7b26ee1aa615953228b9781474

Former-commit-id: d7cb0b4b0f [formerly 907425cb04] [formerly 59f4baa5fe] [formerly d7cb0b4b0f [formerly 907425cb04] [formerly 59f4baa5fe] [formerly 18e1ede6a1 [formerly 59f4baa5fe [formerly 32621b600176a3afff5ee42228eb8cee2417c9c6]]]]
Former-commit-id: 18e1ede6a1
Former-commit-id: 1e7caee5e1 [formerly 28a002c7ee] [formerly 0adc225e8f28e7b8d65568f3c0a1549c6f9c3cd2 [formerly 1fa26e89c6]]
Former-commit-id: e35a4ec3d82132c6db7b92f3c4ff22683c474dba [formerly bf66115f2f]
Former-commit-id: 9c06b6c433
2014-12-05 15:31:46 -05:00
Slav Korolev
384125e388 Omaha #3873 - Fixed assigning timeObs for maritime record.
Former-commit-id: fc045d397e [formerly 4b43ae6fb4] [formerly 090bc93302] [formerly fc045d397e [formerly 4b43ae6fb4] [formerly 090bc93302] [formerly 63026ac59b [formerly 090bc93302 [formerly ccdf4928b9527e85684fb0d4eaa67435f8da5559]]]]
Former-commit-id: 63026ac59b
Former-commit-id: f691ef9c11 [formerly 7d0803fcb1] [formerly 7a7e0f7c520306ee470317b3986f23a40ee79e12 [formerly f697594b73]]
Former-commit-id: 2fb2498c02286765c7ab91948c93ee51d0929362 [formerly 574b4b694f]
Former-commit-id: 3b7f93daae
2014-12-05 14:29:15 -05:00
Roger Ferrel
f28e7f4313 Omaha #3658 Scale arrows and use consistent units.
Change-Id: I7a627b015d2806e8456dd77e0eae679bbd370899

Former-commit-id: bc889a1b6b [formerly faea9e0ddc] [formerly 5d91f976af] [formerly bc889a1b6b [formerly faea9e0ddc] [formerly 5d91f976af] [formerly 64b8d193f4 [formerly 5d91f976af [formerly 0f0eafd8687edc0c10ef21495175f1e68f926577]]]]
Former-commit-id: 64b8d193f4
Former-commit-id: 32fe42fb59 [formerly 526cfcb77d] [formerly 3e4c050f6e6638ea85247a7c76fe84bcf5b85e09 [formerly 335f9b862e]]
Former-commit-id: a9b77c2cdc276fe3cee3f0f94e316b35bcdc2d58 [formerly 526855c99a]
Former-commit-id: b0d8f553da
2014-12-05 11:54:27 -06:00
Bryan Kowal
d66c1a0d43 Omaha #3508 - remove references to yajsw in %files
Former-commit-id: 121f1068ca [formerly 16a33efd8b] [formerly 9e55db1c52] [formerly 121f1068ca [formerly 16a33efd8b] [formerly 9e55db1c52] [formerly 9e77b9635e [formerly 9e55db1c52 [formerly 471f14a73ca4e6575e5a2316ac17cddc5ca42bb9]]]]
Former-commit-id: 9e77b9635e
Former-commit-id: e1a62ff167 [formerly 5644901634] [formerly 9d2131c1c4195c68ae2b4242ce29d62a04093299 [formerly 7575599185]]
Former-commit-id: 336cd43d4b46abfdcfc533ea65ab126e5d21c0c7 [formerly cc4ee08244]
Former-commit-id: 3ec292bebb
2014-12-05 10:04:42 -06:00
Bryan Kowal
4b233d615c Omaha #3508 - fix deploy-install for yajsw.
Former-commit-id: 4b1e4c4604 [formerly 4827d5b8fc] [formerly 0d773ebd42] [formerly 4b1e4c4604 [formerly 4827d5b8fc] [formerly 0d773ebd42] [formerly 90f15ff22c [formerly 0d773ebd42 [formerly 75cf2b3e03ad446408c3d201e6e36bde5f1095f2]]]]
Former-commit-id: 90f15ff22c
Former-commit-id: 5558bd0d97 [formerly f649b34f06] [formerly 13665440334c464bc862f1ae4ff903fd6219fe01 [formerly 9779219edb]]
Former-commit-id: 8080b1b84f204aa5385e851653b8e7e8f66395fb [formerly 8d09387266]
Former-commit-id: 02cd2719af
2014-12-05 09:38:47 -06:00
Bryan Kowal
4b83570666 Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm.
Former-commit-id: 4aaf636e18 [formerly 289689e774] [formerly 19f6551c88] [formerly 4aaf636e18 [formerly 289689e774] [formerly 19f6551c88] [formerly 48ec32e595 [formerly 19f6551c88 [formerly f6a3317e329728080f8efe8db545e3324161986e]]]]
Former-commit-id: 48ec32e595
Former-commit-id: 0e79d9e7a8 [formerly aba4679eb6] [formerly 39a25df1c5ea9e51a812bdbf1ec764e207623861 [formerly 9f5297504d]]
Former-commit-id: 53663102c30f8e33519ac669cb7464894a692105 [formerly ec8371db52]
Former-commit-id: 258f7a93ca
2014-12-05 09:20:23 -06:00