Commit graph

7110 commits

Author SHA1 Message Date
Brian Clements
129df50eee Omaha #3708 collaboration feed room supports blacklists
refactored SiteConfigurationManager

Change-Id: I74282074862674cac6b9190adafe38ed6d607dc5

Former-commit-id: 7d4dbd204e [formerly c33a5ad562] [formerly dfb43fda31] [formerly 7d4dbd204e [formerly c33a5ad562] [formerly dfb43fda31] [formerly 2a7feaebfe [formerly dfb43fda31 [formerly 9b2e76141b7cdd49c145d9d54f83e49ba3ea0d78]]]]
Former-commit-id: 2a7feaebfe
Former-commit-id: 844cd86c28 [formerly 4429a04d2c] [formerly f8802ed9ae8429e0853425985fe3dec6fe60d41d [formerly 38b4d2683c]]
Former-commit-id: ab77d717ac89ffff13f622ac601eb1c2169d0af0 [formerly 53a61c3230]
Former-commit-id: 258be9acb0
2014-10-13 11:11:32 -05:00
Nate Jensen
6b9ddca8fd Merge "Omaha #3711 Allow configuration of how chat lines will display" into omaha_14.4.1
Former-commit-id: 0ad0f650b5 [formerly 3b54d07fa2] [formerly 190a85c872] [formerly 0ad0f650b5 [formerly 3b54d07fa2] [formerly 190a85c872] [formerly 8ccb625dc4 [formerly 190a85c872 [formerly f36afc27474267133b414d13951c271c5217f4dd]]]]
Former-commit-id: 8ccb625dc4
Former-commit-id: f049f66679 [formerly ec2064e610] [formerly 2db98a5b298dc3ae527994785f1f184c5fdf97fe [formerly 1efa1f1497]]
Former-commit-id: 3c67fb85df6bcb3238c7460cb4437e950527157b [formerly bd4b2a80bb]
Former-commit-id: a6ec34628e
2014-10-10 14:45:54 -05:00
Mark Peters
d71fcd6598 Omaha #3711 Allow configuration of how chat lines will display
Change-Id: Ibe66602c4e527a265be4ce9758652eaebdbe132f

Former-commit-id: 4660b63394 [formerly f8e3c8412b] [formerly 5d87f3d22d] [formerly 4660b63394 [formerly f8e3c8412b] [formerly 5d87f3d22d] [formerly fb6131869c [formerly 5d87f3d22d [formerly b929d424107b0a2495f4305fd2500e362cccce4e]]]]
Former-commit-id: fb6131869c
Former-commit-id: 49ef7a1031 [formerly 727a916df5] [formerly 50225ba45f08abd6c25c15f3cede8666db675c23 [formerly 00004f21ed]]
Former-commit-id: 8caa9e43f590a54a66e3f6ee910e714b12842e43 [formerly 7cc0a3b62c]
Former-commit-id: 38cd69e6b0
2014-10-10 14:25:38 -05:00
Nathan Bowler
a7786a80c6 Omaha #3595 Register two more fields. Replace UEngine with DAF and properly call the script
Change-Id: I3dac64f0537877858f9cf0bbf9e394e0e56075ba

Former-commit-id: 74275e8715 [formerly db82cdbdfe] [formerly 1df2418409] [formerly 74275e8715 [formerly db82cdbdfe] [formerly 1df2418409] [formerly 33e141dd38 [formerly 1df2418409 [formerly e1470cb4ce03b49ac85936760469a22786195a99]]]]
Former-commit-id: 33e141dd38
Former-commit-id: c9a5d45133 [formerly 0a267a8c22] [formerly c69ad51322f534045455456de9c265d350c51a6b [formerly 93b2dfc2c9]]
Former-commit-id: 69ba1fb4721a4c84598df9efc5de1052a6821fe8 [formerly 815d28aef9]
Former-commit-id: 0c28de9d2a
2014-10-10 13:20:04 -04:00
Nate Jensen
38b6f4a6ce Merge "Omaha #3595 Fix sed call and man/sigw indices for proper comparison." into omaha_14.4.1
Former-commit-id: 0eb32c3d0c [formerly 404a87b2c9] [formerly 70561d721a] [formerly 0eb32c3d0c [formerly 404a87b2c9] [formerly 70561d721a] [formerly e7d524c06a [formerly 70561d721a [formerly bcc0d1c4f9516e90205d4c140ede99910d1af3b9]]]]
Former-commit-id: e7d524c06a
Former-commit-id: 597331c182 [formerly 32099edd46] [formerly e07bb5ca5e0215410177a81f6295ee434814b6e1 [formerly 93c71345ae]]
Former-commit-id: 5810e71d86b369a1424b08acf25151b2e4b3fae4 [formerly 6228516577]
Former-commit-id: 365acbdff8
2014-10-10 11:47:32 -05:00
Richard Peter
4b22a86fd5 Merge "Omaha #3718 Restored data delivery subscription backup web page" into omaha_14.4.1
Former-commit-id: 01eb1572dc [formerly f0243b5e5f] [formerly e7fbc0c012] [formerly 01eb1572dc [formerly f0243b5e5f] [formerly e7fbc0c012] [formerly b41be59fd6 [formerly e7fbc0c012 [formerly d3fa6c45ca179e5196af8078ae45ccb4a883804e]]]]
Former-commit-id: b41be59fd6
Former-commit-id: d7e45ede15 [formerly f725b827eb] [formerly af37c740a203cbe702ab7d1c5d9dfdf5682f0dd1 [formerly 421fb43d60]]
Former-commit-id: c67c0c2e931b66d28973c05bc91f0b2883230d28 [formerly 8f4e482678]
Former-commit-id: 47def22dd0
2014-10-10 11:13:12 -05:00
Nathan Bowler
5027682b48 Omaha #3595 Fix sed call and man/sigw indices for proper comparison.
Change-Id: Iee0ce15d06e2c84ac8bb4f5a3cf82a3c237222d2

Former-commit-id: b8e8e83a6f [formerly 453cca2ee0] [formerly 36d77f1098] [formerly b8e8e83a6f [formerly 453cca2ee0] [formerly 36d77f1098] [formerly 27cdd53ea8 [formerly 36d77f1098 [formerly 97555449ae12eab272ef3307297b89145b97363b]]]]
Former-commit-id: 27cdd53ea8
Former-commit-id: f2d1f2b3c0 [formerly 7a4f952c9e] [formerly b9d777217ece12358aa9bd323f1f43b1d39a9ed4 [formerly 0adb2897fb]]
Former-commit-id: 46ffeb57e2a5d53a0b761a32992e29820952072c [formerly 2f799919a6]
Former-commit-id: c8e36c93c4
2014-10-10 12:05:16 -04:00
Benjamin Phillippe
3dde5802f1 Omaha #3718 Restored data delivery subscription backup web page
Change-Id: I87c40d3476068eef80cee8bdb47b41fa96539734

Former-commit-id: 7e7b270f68 [formerly a7d5db57d8] [formerly 825aa0d5b2] [formerly 7e7b270f68 [formerly a7d5db57d8] [formerly 825aa0d5b2] [formerly df6b3b3832 [formerly 825aa0d5b2 [formerly f7c7fe2f7b845563335559839a832b26c2ad2b2a]]]]
Former-commit-id: df6b3b3832
Former-commit-id: 668d74c0b9 [formerly 48f13629a7] [formerly f7fd64476307bf7d8c21d3cde879579426f25b91 [formerly d7c1c5805f]]
Former-commit-id: 65f36073234960b8a0fad1f1f66ab03f6092e7c9 [formerly e2ec6c4a0b]
Former-commit-id: ad58fdbb57
2014-10-10 10:59:16 -05:00
Nathan Bowler
33fde84e1b Omaha #3595 Adding original, unmodified raobs scripts.
Change-Id: I466b5b89790bff9887022a35deda7c9f9871bc80

Former-commit-id: 544b2f9fbc [formerly 5e5256fca1] [formerly 104b47daa2] [formerly 544b2f9fbc [formerly 5e5256fca1] [formerly 104b47daa2] [formerly 4241eab8ac [formerly 104b47daa2 [formerly d6793fc17662a0ea0d5814524f4e641e1524ebde]]]]
Former-commit-id: 4241eab8ac
Former-commit-id: 15b53bfdea [formerly 939e8a4736] [formerly 3de4554ead51c602dafcca7b1824049f3402c073 [formerly aa36802cdf]]
Former-commit-id: 75f7dcfdf94642ea6815ee21fcb23c29f72bedc6 [formerly 0f5499d93c]
Former-commit-id: e343c017fb
2014-10-10 11:33:07 -04:00
Nate Jensen
92e3be5998 Omaha #3549 remove unnecessary @Column annotations from TextRecord
Change-Id: I5f36baf0c7b697782379bef0dd5c28d8cb60e77e

Former-commit-id: 81aab98b59 [formerly 974113a995] [formerly afb64bc4bb] [formerly 81aab98b59 [formerly 974113a995] [formerly afb64bc4bb] [formerly b638e6e0f6 [formerly afb64bc4bb [formerly 4a5b66b00fbb53b4fcb4340366347ae4b08e6992]]]]
Former-commit-id: b638e6e0f6
Former-commit-id: 06562ee894 [formerly 57fac3e239] [formerly ab8c772c1836403daf9582dcbf7068fc1f188629 [formerly c552655866]]
Former-commit-id: 178b7541fab5b6fa0d9a1ac9c733a247efaea480 [formerly e3eb361995]
Former-commit-id: 753bb66398
2014-10-10 09:01:29 -05:00
Nate Jensen
0e3867463e Merge "Omaha #3644 Remove dataURI from ccfp plugin" into omaha_14.4.1
Former-commit-id: 5ca72c6d2a [formerly d10d25e425] [formerly 3cc3b38539] [formerly 5ca72c6d2a [formerly d10d25e425] [formerly 3cc3b38539] [formerly ee51fe1977 [formerly 3cc3b38539 [formerly 8a0cf09901a2ffec4b67bc1d993a4c545bffa8bc]]]]
Former-commit-id: ee51fe1977
Former-commit-id: 48172cbed6 [formerly 3cca074583] [formerly a6bce9777358808eafaedf51cd9e0f1fd2b9d780 [formerly 2c17405d5f]]
Former-commit-id: df863c9db18720a854169e46a9728e958bcac43d [formerly 9098eaac2a]
Former-commit-id: b2d2db7eb2
2014-10-09 18:30:33 -05:00
Nate Jensen
519bd8f292 Merge "Omaha #3706 Adding auto-generated python files to gain region lookup functionality by using regions.xml." into omaha_14.4.1
Former-commit-id: 0e35dfff77 [formerly f70c9deacb] [formerly 13f4746613] [formerly 0e35dfff77 [formerly f70c9deacb] [formerly 13f4746613] [formerly 22fce26b0e [formerly 13f4746613 [formerly 7751e4e17ac543ba18abbd3ba7f2355c13c81d4e]]]]
Former-commit-id: 22fce26b0e
Former-commit-id: e701cbe453 [formerly c554ce1713] [formerly 63f554767cc2e844b660d6897f7bd483b503f8a3 [formerly c3d936373f]]
Former-commit-id: 07f1f239af24b0018501aed0d3d11b82bb7d4e04 [formerly cdd730fe6b]
Former-commit-id: 6bbfc99a98
2014-10-09 15:32:38 -05:00
Mark Peters
b026ccef45 Omaha #3644 Remove dataURI from ccfp plugin
Change-Id: I35e2e9239e6059f64c444d173b0a745d889abc27

Former-commit-id: 94364ab115 [formerly c20d19a2d3] [formerly cf1bff0d02] [formerly 94364ab115 [formerly c20d19a2d3] [formerly cf1bff0d02] [formerly 6bb4f5dbdf [formerly cf1bff0d02 [formerly 3eaa3fa11068cbf6d1a58d4eb414f52f243bbaea]]]]
Former-commit-id: 6bb4f5dbdf
Former-commit-id: ed61a1a3a8 [formerly 95a34bd053] [formerly bab42edcd9b274b3abc3f6b16f3cfd76ddf324dc [formerly 5b5fac85b8]]
Former-commit-id: ed09793cc93fee4c1805bf02118b29ade7b0bf80 [formerly c3665bccd9]
Former-commit-id: c906433c99
2014-10-09 15:30:23 -05:00
Mark Peters
b49a553f6a Omaha #3629 Fix null pointer exceptions from matchElement() replacements
Change-Id: I9fcf81c5179f099c1813f0fa1086c85bdcff4513

Former-commit-id: 99b25a3031 [formerly 7f3eb45256] [formerly 087dabe3bb] [formerly 99b25a3031 [formerly 7f3eb45256] [formerly 087dabe3bb] [formerly 63069f5adc [formerly 087dabe3bb [formerly e0330ab61d027ee3b8512230b64000bb7f3d71f1]]]]
Former-commit-id: 63069f5adc
Former-commit-id: 619db846e1 [formerly 1af7b2d388] [formerly 29833ce73d0fdbb27149d63267e22cbd07a4baf2 [formerly bcb39bffb5]]
Former-commit-id: 639296e40463ea00ebc336707de18299d1f27a62 [formerly a87212a8d7]
Former-commit-id: 4864414e11
2014-10-09 11:17:53 -05:00
Richard Peter
6c2cfadf4c Merge "Omaha #3675 alertviz cleanly exits when killed by signal" into omaha_14.4.1
Former-commit-id: fddf14712a [formerly db0e85e501] [formerly ed2bd7a261] [formerly fddf14712a [formerly db0e85e501] [formerly ed2bd7a261] [formerly 26e4c16da4 [formerly ed2bd7a261 [formerly 5977e37b7368487867aca1cfdd362943633f92eb]]]]
Former-commit-id: 26e4c16da4
Former-commit-id: a3a6b0a554 [formerly e71b0562b5] [formerly d2e0631fa3248d80703a209983c63962831939c8 [formerly bdb3bb263d]]
Former-commit-id: df60de25e6bd0dd52c1aba0d041f5e2f0cde4782 [formerly bcc3432a9d]
Former-commit-id: 6f4a6c7f6d
2014-10-09 11:09:32 -05:00
Brian Clements
a8ee8adbad Omaha #3675 alertviz cleanly exits when killed by signal
Change-Id: I0ef7c8936558ccd8b927edb64143315afcb04631

Former-commit-id: 2112fb8e60 [formerly 8d58b8d524] [formerly 119b2bff17] [formerly 2112fb8e60 [formerly 8d58b8d524] [formerly 119b2bff17] [formerly fbabf6f18d [formerly 119b2bff17 [formerly 6bc42c58541363bee9be1607b1bdf2aca6f5a000]]]]
Former-commit-id: fbabf6f18d
Former-commit-id: f7715d0c3b [formerly fa7a3e2e43] [formerly df78f5c496a36155869321af4867e6ab03d2ffb0 [formerly 6be495b787]]
Former-commit-id: b11048de8d398d05a7747684f0268aa35724516e [formerly f9e4622db7]
Former-commit-id: 0aa5f80ca8
2014-10-09 11:04:49 -05:00
Nate Jensen
4b7163ff79 Merge "Omaha #3705 added collaboration public room search, bookmarking" into omaha_14.4.1
Former-commit-id: 91ba36db75 [formerly 550b269370] [formerly f6601e4ee1] [formerly 91ba36db75 [formerly 550b269370] [formerly f6601e4ee1] [formerly 1a24808709 [formerly f6601e4ee1 [formerly 05a008ed69414e3977998cca45516a736181d5b6]]]]
Former-commit-id: 1a24808709
Former-commit-id: c14691cba1 [formerly f3c1ca00d2] [formerly 024f1c40cc395ad17cece7abc6f869ff6b39b5de [formerly 145db4077e]]
Former-commit-id: e83aebdfadbb6cd359c4c1a685edfb2e2319fd36 [formerly 17971ea0b6]
Former-commit-id: c9e949c8bd
2014-10-09 09:38:27 -05:00
Nate Jensen
45713940b4 Merge "Omaha #3672 moved aviation advisory plugins to separate feature" into omaha_14.4.1
Former-commit-id: d36751c260 [formerly 87d33ff6ca] [formerly 0d33e661f2] [formerly d36751c260 [formerly 87d33ff6ca] [formerly 0d33e661f2] [formerly 98518f4cb6 [formerly 0d33e661f2 [formerly 5ae10ba1a54ec5b20d1569d6c78c2762015c35de]]]]
Former-commit-id: 98518f4cb6
Former-commit-id: 4db5642bd0 [formerly 6851264338] [formerly 75c66f217107e5e8b2a39939209f323c3da00152 [formerly 2a962aedf7]]
Former-commit-id: 86930d7e425e0216b1184a4910d2036def52b808 [formerly 96933e89a7]
Former-commit-id: 873cf49d2e
2014-10-09 09:02:36 -05:00
Brian Clements
dc45bb7100 Omaha #3705 added collaboration public room search, bookmarking
Change-Id: I298254111d1eb305820c313ebe176f091fe7a818

Former-commit-id: abb6b1f258 [formerly 1a6624d5d7] [formerly 87964cb500] [formerly abb6b1f258 [formerly 1a6624d5d7] [formerly 87964cb500] [formerly f0921db20c [formerly 87964cb500 [formerly 919c816ba7af2082b9dcb0308128fa1b228475d2]]]]
Former-commit-id: f0921db20c
Former-commit-id: 49e6579115 [formerly d7c864113c] [formerly d5b69cedb564d53bd3cab131f05d49d804074b08 [formerly eac32a0fa0]]
Former-commit-id: 219ae40cec22d5a5e877b7c88ca0a55315f52516 [formerly 72c5dd03d2]
Former-commit-id: 51084e6548
2014-10-09 08:38:45 -05:00
Brian Clements
0be119b360 Omaha #3672 moved aviation advisory plugins to separate feature
Change-Id: I7a71eceb14bba27648260e873aeef38982c6084f

Former-commit-id: 84217692bf [formerly 4a824111ec] [formerly 8a4cda892f] [formerly 84217692bf [formerly 4a824111ec] [formerly 8a4cda892f] [formerly 577b3a5e11 [formerly 8a4cda892f [formerly 771e06df242b0fe7b4eec1e7c3099dfd316182ce]]]]
Former-commit-id: 577b3a5e11
Former-commit-id: fbffc63d5a [formerly 6ad5c3088d] [formerly 4cc2a0452da8ecf06e249d8ed7253d57b4357a97 [formerly 2de14cf885]]
Former-commit-id: 4ab31ef1abb0d696f1850c3f5c7dd3a3e55add19 [formerly 8ec3f473d7]
Former-commit-id: 3624ea94dc
2014-10-08 16:47:10 -05:00
Robert Blum
fbd1a740f6 Omaha #3706 Adding auto-generated python files to gain region lookup functionality by using regions.xml.
Change-Id: Ifee9297729b814983634d438bff355f6eddb0008

Former-commit-id: da4f5de40f [formerly caee4eba19] [formerly 9bef0b91f8] [formerly da4f5de40f [formerly caee4eba19] [formerly 9bef0b91f8] [formerly f8661bdb73 [formerly 9bef0b91f8 [formerly 8c609041f3cabc11588d282b0a91b514a569073a]]]]
Former-commit-id: f8661bdb73
Former-commit-id: 7023892239 [formerly 58d4b90920] [formerly ca938621e5e22a7d3ede60b023930d1d80849b48 [formerly 153fdb982f]]
Former-commit-id: e436a49aa33b5a2de79281f279c0843d92c4a5ba [formerly d18cb00dc1]
Former-commit-id: 869d81c170
2014-10-08 13:05:23 -05:00
Ben Steffensmeier
fbef627949 Omaha #3674 Fix a few viirs projection bugs.
Former-commit-id: 9d233500c8 [formerly 314014503f] [formerly b7c0eb89ad] [formerly 9d233500c8 [formerly 314014503f] [formerly b7c0eb89ad] [formerly b865762b4f [formerly b7c0eb89ad [formerly e0ec387c62e64a19a4d598578f18ee17686f312a]]]]
Former-commit-id: b865762b4f
Former-commit-id: 4db5a06fc1 [formerly ea47d859c6] [formerly 0a67866e2eee8e629df81d359675f34427353f58 [formerly 44d2085dad]]
Former-commit-id: 87ebb5cd2485e8cc312bbe5c405fb72dede7f650 [formerly 254c1e7130]
Former-commit-id: f850818be8
2014-10-08 12:21:03 -05:00
Richard Peter
d215cc7fcb Merge "Omaha #3300 Merge conflict resolution with old Vbsources.xml." into omaha_14.4.1
Former-commit-id: a4fd6b8a09 [formerly 04bf8666b3] [formerly e8bc97501b] [formerly a4fd6b8a09 [formerly 04bf8666b3] [formerly e8bc97501b] [formerly fa15d4ff21 [formerly e8bc97501b [formerly 157588d388b9033424ddc46a22d74ccc302eea85]]]]
Former-commit-id: fa15d4ff21
Former-commit-id: 422a457e9e [formerly baabb4a12f] [formerly 7a305bc6129c81c773d00eed85f56a1759d93cfa [formerly d97655272f]]
Former-commit-id: 867a14e53bc275209f6bf4d3d19485de51ca196e [formerly 26ee8506f5]
Former-commit-id: e5b9aa8b3f
2014-10-08 12:02:17 -05:00
Nate Jensen
6a60c19497 Merge "Omaha #3398 moved user and userid to core" into omaha_14.4.1
Former-commit-id: 5886518b3b [formerly 2502976504] [formerly 4e582d0bde] [formerly 5886518b3b [formerly 2502976504] [formerly 4e582d0bde] [formerly 5cf1821a6a [formerly 4e582d0bde [formerly 87f49d9bcc07d2178a535fc934d02cab36063894]]]]
Former-commit-id: 5cf1821a6a
Former-commit-id: 8b8899fc2e [formerly 53c464b647] [formerly 789872670a0650c9c9b581c9d0d67b2ee58b08c5 [formerly 32fda0ae19]]
Former-commit-id: d23f99ce9a984fc9d497dfcf6c906ac83a827ad2 [formerly 9135b7458f]
Former-commit-id: a3f23422a7
2014-10-08 11:36:44 -05:00
Nate Jensen
1c3aa82d84 Merge "Omaha #3594 Update profiler script to use DAF." into omaha_14.4.1
Former-commit-id: 460a7e917f [formerly f2db612cd3] [formerly aa9567ccbe] [formerly 460a7e917f [formerly f2db612cd3] [formerly aa9567ccbe] [formerly ea23c651a1 [formerly aa9567ccbe [formerly 617994f10079a9b905f37c1bf1c1b83e6a210e61]]]]
Former-commit-id: ea23c651a1
Former-commit-id: 92b114a261 [formerly 3163618c59] [formerly 46563d9ac2743d4b39d07ef20f91dfe7d3375cd1 [formerly affddd1b8b]]
Former-commit-id: a7fd83687d96f291afdb8eb3d6bd225b58ed0183 [formerly 17b6410a1c]
Former-commit-id: f3e8860a8d
2014-10-07 17:18:51 -05:00
Richard Peter
a936b8612b Omaha #3300 Fix merge of OB_14.3.1-25m
Change-Id: Ia9afe6316f3dac301caf97a6868d1baaf179f632

Former-commit-id: 8ffa01471a [formerly f5dd25c8e4] [formerly a4bfd2d28b] [formerly 8ffa01471a [formerly f5dd25c8e4] [formerly a4bfd2d28b] [formerly a9562d992c [formerly a4bfd2d28b [formerly 110499cec453532545431a6fa05057f47af66ed2]]]]
Former-commit-id: a9562d992c
Former-commit-id: c217191493 [formerly 901877ec7a] [formerly 10f0ab60c2c0a25fca107e20817d044f303c4afe [formerly 1be207dccb]]
Former-commit-id: 0119dd744b38196e2ed0f52406b1c9c17f175d11 [formerly 1ec3bdd877]
Former-commit-id: 3998dac2f0
2014-10-07 16:32:48 -05:00
Richard Peter
9f372715f5 Merge "Omaha #3702 register database plugin to fxa database." into omaha_14.4.1
Former-commit-id: 1038af1901 [formerly ee86734625] [formerly 1adac05f5a] [formerly 1038af1901 [formerly ee86734625] [formerly 1adac05f5a] [formerly 1bc24c3be2 [formerly 1adac05f5a [formerly 0ceea4d3d7e36160a70ea9f7f5256d94cd2778b5]]]]
Former-commit-id: 1bc24c3be2
Former-commit-id: e660a61fa9 [formerly 4f056d76c8] [formerly dcfabbc95e67fec2343f8bc01a273a0ef2f97589 [formerly c6cb389a3d]]
Former-commit-id: fee614f33d7cd6e30009bae10026ea09adbfa457 [formerly 327d82ed02]
Former-commit-id: 7bb803b504
2014-10-07 15:13:11 -05:00
Nathan Bowler
a53fa83f99 Omaha #3594 Update profiler script to use DAF.
Change-Id: Id0553c1c8745ae4371776fcdb4ec610f8f142ab0

Former-commit-id: 1c7dbefc31 [formerly 8e3ef542bf] [formerly 1fd0ece81a] [formerly 1c7dbefc31 [formerly 8e3ef542bf] [formerly 1fd0ece81a] [formerly e7f86f19c1 [formerly 1fd0ece81a [formerly 3c55fd78ca42a04ee0b0a9bbb88034c83f30e583]]]]
Former-commit-id: e7f86f19c1
Former-commit-id: a243aa93d2 [formerly db1c0f21b6] [formerly 309aadf808d732273707976d97d0deeeae187624 [formerly a23f95abdc]]
Former-commit-id: 02f18d33b32654a6338f29a2f7c5a7710bc5f782 [formerly eaf614ae66]
Former-commit-id: 658f943995
2014-10-07 15:23:38 -04:00
Nate Jensen
85774367dc Merge "Omaha #3668 grid data request uses thread pool" into omaha_14.4.1
Former-commit-id: 92caee5227 [formerly 0bfc7514a4] [formerly 70521e80f8] [formerly 92caee5227 [formerly 0bfc7514a4] [formerly 70521e80f8] [formerly 6d0d6c2a96 [formerly 70521e80f8 [formerly a75ecea2121d1c030a7acb4ba50095a6d2769c01]]]]
Former-commit-id: 6d0d6c2a96
Former-commit-id: c988ab129d [formerly 52e7dd82c0] [formerly 81b7914b3094bd0fe354bbbce1e009bec017a6d9 [formerly 5051b47832]]
Former-commit-id: c981b036f8f82e3cfc80ab10d981704f1af2defc [formerly 541e10e9d6]
Former-commit-id: 4126b426eb
2014-10-07 13:54:08 -05:00
Nate Jensen
7091f791d8 Merge "Omaha #3690 added tool to remove empty localization dirs" into omaha_14.4.1
Former-commit-id: 056dbe465d [formerly affc326eb7] [formerly 11f460f876] [formerly 056dbe465d [formerly affc326eb7] [formerly 11f460f876] [formerly 726eea342f [formerly 11f460f876 [formerly cdeea610953d82fe2b380341b3059b15b6ecd1ff]]]]
Former-commit-id: 726eea342f
Former-commit-id: 639938641e [formerly 4267d54502] [formerly 2387192aa4c7f8ef68f1f17c0f603131fa1338e6 [formerly 557c040868]]
Former-commit-id: d82f0ba325f8130d4a49ac6126ba1b31a9438658 [formerly bf0eb369b3]
Former-commit-id: 12e3c3ff75
2014-10-07 13:53:43 -05:00
Nate Jensen
6ab10f279f Merge "Omaha #2618 Deleted points don't get removed from the selected list" into omaha_14.4.1
Former-commit-id: 3e4434f708 [formerly e63de52465] [formerly c066e8264d] [formerly 3e4434f708 [formerly e63de52465] [formerly c066e8264d] [formerly b0f025c0df [formerly c066e8264d [formerly 60155e8f96ba20204c6049206ef35a840f64a767]]]]
Former-commit-id: b0f025c0df
Former-commit-id: dec72bc6c5 [formerly 0b10454635] [formerly ce928a70b87a81dd02c2e04fea570e6de94ae2ba [formerly b63050a0e9]]
Former-commit-id: dcfc7a4fcee1eaad28a80eb0597e7899bfdb5d34 [formerly 416a45b417]
Former-commit-id: 6e2dc7f7d3
2014-10-07 13:53:33 -05:00
Nate Jensen
f99ca416ca Merge "Omaha #3594 Add original, unaltered Profiler scripts." into omaha_14.4.1
Former-commit-id: 860f584065 [formerly e3a1adb7f2] [formerly 1e16abcfcd] [formerly 860f584065 [formerly e3a1adb7f2] [formerly 1e16abcfcd] [formerly 09cf5de2dd [formerly 1e16abcfcd [formerly 747f8fc91e2ff977724f634b6e610c96150cb4ad]]]]
Former-commit-id: 09cf5de2dd
Former-commit-id: 6140e0ac31 [formerly 38be3b94b7] [formerly 63c392ca022a0f6f7cd0160df10fa464a320d98c [formerly 0425092c20]]
Former-commit-id: bcbd1ce36eab868fcf0039397ea58b61fbb7e349 [formerly ef4883bda6]
Former-commit-id: 4ff50c4c86
2014-10-07 13:52:36 -05:00
Nathan Bowler
00485b4d8c Omaha #3594 Add original, unaltered Profiler scripts.
Change-Id: Iea71e2fa91881c31b67e0f1fb1fd89c8b28da1e9

Former-commit-id: bcc339a859 [formerly adecc6efa4] [formerly ab2e0edb82] [formerly bcc339a859 [formerly adecc6efa4] [formerly ab2e0edb82] [formerly b84fee6aed [formerly ab2e0edb82 [formerly e57506f274da8a2d917c6cf061e789e50993b5c3]]]]
Former-commit-id: b84fee6aed
Former-commit-id: bbefa2d070 [formerly ab157527b9] [formerly e72139d992b6a3a44db2b6d03c3f058b6211e9ff [formerly efbe205ba8]]
Former-commit-id: 1ef32fcadaac6b057d1ee75e09a6792d30a777c0 [formerly 36293c548f]
Former-commit-id: b4da44c655
2014-10-07 14:40:49 -04:00
Steve Harris
118c19a83d Merge tag 'OB_14.3.1-25m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeseasAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/AbstractSpatialEnabler.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/BestResResourceData.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FogMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SSMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SnowMonitorConfigurationManager.java

Former-commit-id: c0c1ce7700 [formerly 39b2199cec] [formerly ad4393bea3] [formerly c0c1ce7700 [formerly 39b2199cec] [formerly ad4393bea3] [formerly c9e37bf440 [formerly ad4393bea3 [formerly 6bb7a7312a22a9585d2f5981d873751879082cb1]]]]
Former-commit-id: c9e37bf440
Former-commit-id: e80527ade2 [formerly fc424d7336] [formerly 669e99e1efdfc40962f1589446fe9efe4b3f8b52 [formerly fc35b7313d]]
Former-commit-id: 292297ad70be43ccc935b96eca7a8409d4033fc4 [formerly f370a2f54e]
Former-commit-id: 7c4bb336e1
2014-10-07 13:35:58 -05:00
Brian Clements
8edd2ad753 Omaha #3668 grid data request uses thread pool
Change-Id: I75023960c89f18b87e1bce5a2063c0c6212005ac

Former-commit-id: 0cd0db130c [formerly 48352e964d] [formerly 66705190b5] [formerly 0cd0db130c [formerly 48352e964d] [formerly 66705190b5] [formerly 42cefd3655 [formerly 66705190b5 [formerly ccd1d646a175e6a2493def2fb3a22d7109e225a7]]]]
Former-commit-id: 42cefd3655
Former-commit-id: 257c19ee5b [formerly 64a3e0898c] [formerly d78e7b959f63f20c32c2c42030847bd3d9091fdb [formerly 574005859a]]
Former-commit-id: 64ca55ce0cf89a3450ae37ad3fe38be7fd59dd0b [formerly 9b83a97637]
Former-commit-id: c56ea85517
2014-10-07 13:28:34 -05:00
Mark Peters
ba47bfd846 Omaha #2618 Deleted points don't get removed from the selected list
Change-Id: I0c85af77c4c46c825b6f80ace4df9cce759e981e

Former-commit-id: 41a0fa9bfe [formerly dc27d9252c] [formerly 3464751716] [formerly 41a0fa9bfe [formerly dc27d9252c] [formerly 3464751716] [formerly 5ed537572a [formerly 3464751716 [formerly 5f22815ea1ca5a1fbd010f642afe6a83778f6f58]]]]
Former-commit-id: 5ed537572a
Former-commit-id: e66adcd8ff [formerly 82e2a2bbb5] [formerly e8adb61acc7a249cc87878a153cb4b17d34bf566 [formerly c50ae98b5f]]
Former-commit-id: eab6b7d95d209e071ff8f9cbfcee197abb9ff1a3 [formerly c2173b1925]
Former-commit-id: dffbaa684d
2014-10-07 11:42:44 -05:00
Brian Clements
0bfcdec3d4 Omaha #3398 moved user and userid to core
Change-Id: Id9da2ef25a309c1bbc53f24a59ed2fd1ddbb0407

Former-commit-id: caaf7f9723 [formerly 2637d1b07f] [formerly 773619f741] [formerly caaf7f9723 [formerly 2637d1b07f] [formerly 773619f741] [formerly ec37971eff [formerly 773619f741 [formerly a758b7aff6b30194a3180fddffcefa5d019f2ee5]]]]
Former-commit-id: ec37971eff
Former-commit-id: 65e1114f26 [formerly 67bece24d4] [formerly f7a65a072cadad5df1bf6f1cd57ad81fe808004f [formerly c964fb1e80]]
Former-commit-id: 728fb5fa3a6f593dbe3aaa7dfd1eb72f5ccd01b3 [formerly c148e3e56f]
Former-commit-id: eda2463f7e
2014-10-07 10:43:47 -05:00
Brian Clements
1fc61f30c4 Omaha #3690 added tool to remove empty localization dirs
Change-Id: Id5ec16147d9f159fa17645da79d29d1f5cbaa701

Former-commit-id: c0544fa109 [formerly 090a787f8d] [formerly f39ffcc63f] [formerly c0544fa109 [formerly 090a787f8d] [formerly f39ffcc63f] [formerly 81c73519c2 [formerly f39ffcc63f [formerly a69773742e571a334ef1fd000ff8311805f9c737]]]]
Former-commit-id: 81c73519c2
Former-commit-id: 6dab387f3c [formerly 260b3bab88] [formerly 3c9950192a8e0eb2869d1aeb1f303e772bec509d [formerly c3d7cd6e7f]]
Former-commit-id: d975eccba6c6070192220b506e523400d2d337d6 [formerly 639b2c2510]
Former-commit-id: 49bb8437f6
2014-10-07 08:37:47 -05:00
Ben Steffensmeier
c25ac7effd Omaha #3702 register database plugin to fxa database.
Former-commit-id: d5888d403c [formerly 3e0a99aed2] [formerly 6a2b2efb1a] [formerly d5888d403c [formerly 3e0a99aed2] [formerly 6a2b2efb1a] [formerly 997bfd689d [formerly 6a2b2efb1a [formerly 7fa6925c27330262dd0a70afcb77c589718cf1f7]]]]
Former-commit-id: 997bfd689d
Former-commit-id: 8b52e21a2c [formerly 77c2dcd170] [formerly 0aa3c4d8ca84f5a162f80580a4b8d2c2c45b5ef1 [formerly 7e910088c9]]
Former-commit-id: 3d76f3b15915d70bb7dedac57825640ec68bad59 [formerly 1c6068ee84]
Former-commit-id: 8aac93aeed
2014-10-06 20:00:19 -05:00
Roger Ferrel
1eb7f14c99 Omaha #3300 Merge conflict resolution with old Vbsources.xml.
Former-commit-id: 50982e8160 [formerly 2f8d5263b9] [formerly dfbf07f377] [formerly 50982e8160 [formerly 2f8d5263b9] [formerly dfbf07f377] [formerly d4ef865375 [formerly dfbf07f377 [formerly be87967bf65bc07af5f89c13bf4cfd8eff9b4db6]]]]
Former-commit-id: d4ef865375
Former-commit-id: ecec042861 [formerly 05c00c7bc7] [formerly cb42eace946af5e6c4a04a8e522489b3f209954f [formerly 96f484e323]]
Former-commit-id: 9ad6c12354950dd916b1af65b9e0a613b027237b [formerly 7afe6d2df6]
Former-commit-id: 861da21f34
2014-10-06 15:34:30 -05:00
Steve Harris
cf73096716 Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 53dc9657e2 [formerly 06a27b2d3c] [formerly 39c5e9c314] [formerly 53dc9657e2 [formerly 06a27b2d3c] [formerly 39c5e9c314] [formerly 2db03d95b3 [formerly 39c5e9c314 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]]]
Former-commit-id: 2db03d95b3
Former-commit-id: ca63a8cfc3 [formerly bcf1265a16] [formerly 4363db305e76ae3a50e019f510a7b919ebc7230e [formerly 3542caf090]]
Former-commit-id: 0522d4db8f9331e9bfd83cc7147290634159c673 [formerly cfd49c8ca0]
Former-commit-id: afd3d3fa2d
2014-10-06 13:57:59 -05:00
Nate Jensen
50d26f0da8 Merge "Omaha #3675 remove -clean option from installed caves" into omaha_14.4.1
Former-commit-id: 054947764c [formerly 71efead2db] [formerly 87d80afd0b] [formerly 054947764c [formerly 71efead2db] [formerly 87d80afd0b] [formerly de8b9cf0b8 [formerly 87d80afd0b [formerly 45140e7bd5ac2dcc51351d74dc87119aeac98f3b]]]]
Former-commit-id: de8b9cf0b8
Former-commit-id: 102a1f5c5b [formerly bfd4adcf63] [formerly eae87fcb1695bde68ef1e3bcb6269a6800c5953c [formerly e7c6cf60d5]]
Former-commit-id: b4e87d05085f2a52fa58791b6b3f2601d490818c [formerly 12ecb3b68a]
Former-commit-id: 47a9b16164
2014-10-06 11:37:54 -05:00
Nate Jensen
c91006a7a5 Merge "Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin" into omaha_14.4.1
Former-commit-id: 40d5da5e50 [formerly 24bf870977] [formerly 28545083c5] [formerly 40d5da5e50 [formerly 24bf870977] [formerly 28545083c5] [formerly 05ae6c5d9b [formerly 28545083c5 [formerly ded3f476047f92d48891613e4c0b78d20858f1ff]]]]
Former-commit-id: 05ae6c5d9b
Former-commit-id: 8011cb24d7 [formerly 7a5bc79ac1] [formerly 8ba0a6833e307d530471c42099dea3c755f8024f [formerly 8250390a62]]
Former-commit-id: cf88e69756e8dabb62bda12c20365e87bf5553be [formerly 53441b1866]
Former-commit-id: 763e75f35b
2014-10-06 09:08:03 -05:00
Nate Jensen
a7ed20921b Merge "Omaha #3675 remove explicitly declaring vm to make alertviz.sh more closely match cave.sh" into omaha_14.4.1
Former-commit-id: f35c95de02 [formerly b544abb498] [formerly baec32be20] [formerly f35c95de02 [formerly b544abb498] [formerly baec32be20] [formerly 23c5ea21e4 [formerly baec32be20 [formerly 73be758f4ae461539c4a622cf52b7bc73705fc50]]]]
Former-commit-id: 23c5ea21e4
Former-commit-id: 015c694d2f [formerly 3941281bb0] [formerly 7e9e75b3708abb852b52c881df4127de3e856477 [formerly 88afde5dfa]]
Former-commit-id: 43e8eb44fa4a566ec838fb8744a8301569eb65d6 [formerly fe4e43d8d3]
Former-commit-id: f623152a9c
2014-10-06 09:07:38 -05:00
Richard Peter
4571a8ab14 Omaha #3300 Fix merge of 14.3.1-23
Change-Id: I5cbf187bc5d4ff7c8f0b2f8e33bd8dcc4d0348a9

Former-commit-id: 1958d9fe38 [formerly 2422c00fbd] [formerly 5a0dc20480] [formerly 1958d9fe38 [formerly 2422c00fbd] [formerly 5a0dc20480] [formerly b5f23b8b98 [formerly 5a0dc20480 [formerly 075f3f69cbf19d298398cb7c481668b97d4dad5d]]]]
Former-commit-id: b5f23b8b98
Former-commit-id: 8b763c729d [formerly 84a1b71e23] [formerly e2b2cef1529d8894999bfe919bd88ec5029df5c1 [formerly 4ada2c1c77]]
Former-commit-id: 0380f9430066e76c436aeea08918133a896d8893 [formerly c6171b84c8]
Former-commit-id: f07a0470ee
2014-10-03 14:14:16 -05:00
Brian.Dyke
d8ccd40588 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 5da2026d2b [formerly 85d83aefe0] [formerly f440da9c70] [formerly 5da2026d2b [formerly 85d83aefe0] [formerly f440da9c70] [formerly 92762f46c7 [formerly f440da9c70 [formerly 23d16004c389f0ef708bee2a8bfb84d465b7b36b]]]]
Former-commit-id: 92762f46c7
Former-commit-id: beb7a3f448 [formerly 64aef1a783] [formerly 6e5ec5380fe3992e157472559b5e85f288b4b251 [formerly 4dbdf9de26]]
Former-commit-id: d771453098f05cdadd94113c1504ef71db5e8e6b [formerly 91f89ee1f6]
Former-commit-id: 918de34464
2014-10-03 14:04:46 -04:00
Steve Harris
e40f190f9a Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml

        Issue #3648:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

        Issue #3560:
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
        Also modified with the resolution of #3560:
        edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java


Former-commit-id: fa1fa76dd9 [formerly f4b771ea72] [formerly da463c484e] [formerly fa1fa76dd9 [formerly f4b771ea72] [formerly da463c484e] [formerly 2616fe04b6 [formerly da463c484e [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]]]]
Former-commit-id: 2616fe04b6
Former-commit-id: 1c1e618183 [formerly 306826aed9] [formerly 97756f4cc415dba80b72fef671c8609b2b0ef779 [formerly 523cedbb56]]
Former-commit-id: 85a2c5f56cad1fa8121856b8cb5312cdf481051b [formerly 57f5294f08]
Former-commit-id: e05d31ae36
2014-10-03 10:18:34 -05:00
Mark Peters
71a0ceee2b Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin
Change-Id: I1dc26f81d0a6f39b86eb1e832c7204d8b6ce3348

Former-commit-id: da72adac03 [formerly ffe3444650] [formerly 955f21a85c] [formerly da72adac03 [formerly ffe3444650] [formerly 955f21a85c] [formerly fb62a1e35b [formerly 955f21a85c [formerly 475fa37d70d51e5e9538141730fbead4a6b5d88e]]]]
Former-commit-id: fb62a1e35b
Former-commit-id: bb728b015f [formerly 77da058a9f] [formerly 5748026158d68b3743065ea06e8b17228eeefe25 [formerly 6315da5482]]
Former-commit-id: ed0e605da1d6e67998241f168012ead136be8449 [formerly f9d5dca0e5]
Former-commit-id: eda9693e85
2014-10-02 15:36:22 -05:00
Brian.Dyke
9308ab8537 Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
Former-commit-id: 7390f6c3a8 [formerly db665d3876] [formerly 2a911984f0] [formerly 7390f6c3a8 [formerly db665d3876] [formerly 2a911984f0] [formerly 20dd249d2c [formerly 2a911984f0 [formerly 441fc7561a8526422f9b73b9c47cd220f0babb54]]]]
Former-commit-id: 20dd249d2c
Former-commit-id: 8f0310e3be [formerly 46956a01c6] [formerly b67eecdaf5931ae1d938fb48bd33e3327dd7a473 [formerly 72ea2fbe48]]
Former-commit-id: 1353c554161d3298ae22ce357602c081830d7584 [formerly a3ccdd9704]
Former-commit-id: 572bbdd019
2014-10-02 10:44:50 -04:00
Brian.Dyke
2b3ced91f5 Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 06f6dfc38a [formerly 006bdb00ad] [formerly 65ad6056b6] [formerly 06f6dfc38a [formerly 006bdb00ad] [formerly 65ad6056b6] [formerly f3f95aabb0 [formerly 65ad6056b6 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]]]]
Former-commit-id: f3f95aabb0
Former-commit-id: 452a3f046b [formerly d174db3b0c] [formerly c24910662181554debcd898acc9cf5ec28027cf0 [formerly e77f1e126e]]
Former-commit-id: 2c9750edd9ade43fd7db7e61b4503a53d6f26781 [formerly 1d2dfd264a]
Former-commit-id: e100894074
2014-10-02 10:38:51 -04:00