Nathan Bowler
|
5799dbcadd
|
Omaha #3595 Register two more fields. Replace UEngine with DAF and properly call the script
Change-Id: I3dac64f0537877858f9cf0bbf9e394e0e56075ba
Former-commit-id: 4048efedec [formerly 74275e8715] [formerly db82cdbdfe] [formerly db82cdbdfe [formerly 1df2418409]] [formerly 4048efedec [formerly 74275e8715] [formerly db82cdbdfe] [formerly db82cdbdfe [formerly 1df2418409]] [formerly 33e141dd38 [formerly db82cdbdfe [formerly 1df2418409] [formerly 33e141dd38 [formerly e1470cb4ce03b49ac85936760469a22786195a99]]]]]
Former-commit-id: 33e141dd38
Former-commit-id: 6f8bce5bc9 [formerly c9a5d45133] [formerly 0a267a8c22] [formerly a68d41654ddc2884bf302fc24d47ddb28d8bdc0c [formerly c69ad51322f534045455456de9c265d350c51a6b] [formerly 0a267a8c22 [formerly 93b2dfc2c9]]]
Former-commit-id: 87bd114d8c32e6cf9f4cf60b738126953944ced1 [formerly 69ba1fb4721a4c84598df9efc5de1052a6821fe8] [formerly 0c28de9d2a [formerly 815d28aef9]]
Former-commit-id: 0c28de9d2a
Former-commit-id: a7786a80c6
|
2014-10-10 13:20:04 -04:00 |
|
Nate Jensen
|
9eaf986a3a
|
Merge "Omaha #3595 Fix sed call and man/sigw indices for proper comparison." into omaha_14.4.1
Former-commit-id: 956c0c44ac [formerly 0eb32c3d0c] [formerly 404a87b2c9] [formerly 404a87b2c9 [formerly 70561d721a]] [formerly 956c0c44ac [formerly 0eb32c3d0c] [formerly 404a87b2c9] [formerly 404a87b2c9 [formerly 70561d721a]] [formerly e7d524c06a [formerly 404a87b2c9 [formerly 70561d721a] [formerly e7d524c06a [formerly bcc0d1c4f9516e90205d4c140ede99910d1af3b9]]]]]
Former-commit-id: e7d524c06a
Former-commit-id: 19fb2ba922 [formerly 597331c182] [formerly 32099edd46] [formerly 1a4c44f904756d5339cb354c441610bed9670fbd [formerly e07bb5ca5e0215410177a81f6295ee434814b6e1] [formerly 32099edd46 [formerly 93c71345ae]]]
Former-commit-id: 113cc5399545ff2acaf0f1d8d75ffe7502cb7793 [formerly 5810e71d86b369a1424b08acf25151b2e4b3fae4] [formerly 365acbdff8 [formerly 6228516577]]
Former-commit-id: 365acbdff8
Former-commit-id: 38b6f4a6ce
|
2014-10-10 11:47:32 -05:00 |
|
Richard Peter
|
3012704e00
|
Merge "Omaha #3718 Restored data delivery subscription backup web page" into omaha_14.4.1
Former-commit-id: 3b4d749b87 [formerly 01eb1572dc] [formerly f0243b5e5f] [formerly f0243b5e5f [formerly e7fbc0c012]] [formerly 3b4d749b87 [formerly 01eb1572dc] [formerly f0243b5e5f] [formerly f0243b5e5f [formerly e7fbc0c012]] [formerly b41be59fd6 [formerly f0243b5e5f [formerly e7fbc0c012] [formerly b41be59fd6 [formerly d3fa6c45ca179e5196af8078ae45ccb4a883804e]]]]]
Former-commit-id: b41be59fd6
Former-commit-id: d4795adf86 [formerly d7e45ede15] [formerly f725b827eb] [formerly 60f5ce560229547a1d8cccea3bd72155cf85d319 [formerly af37c740a203cbe702ab7d1c5d9dfdf5682f0dd1] [formerly f725b827eb [formerly 421fb43d60]]]
Former-commit-id: 37aef5ba52f67c1e7b195b9c2e406efa5c075563 [formerly c67c0c2e931b66d28973c05bc91f0b2883230d28] [formerly 47def22dd0 [formerly 8f4e482678]]
Former-commit-id: 47def22dd0
Former-commit-id: 4b22a86fd5
|
2014-10-10 11:13:12 -05:00 |
|
Nathan Bowler
|
b6bb317908
|
Omaha #3595 Fix sed call and man/sigw indices for proper comparison.
Change-Id: Iee0ce15d06e2c84ac8bb4f5a3cf82a3c237222d2
Former-commit-id: 1fef6c18b6 [formerly b8e8e83a6f] [formerly 453cca2ee0] [formerly 453cca2ee0 [formerly 36d77f1098]] [formerly 1fef6c18b6 [formerly b8e8e83a6f] [formerly 453cca2ee0] [formerly 453cca2ee0 [formerly 36d77f1098]] [formerly 27cdd53ea8 [formerly 453cca2ee0 [formerly 36d77f1098] [formerly 27cdd53ea8 [formerly 97555449ae12eab272ef3307297b89145b97363b]]]]]
Former-commit-id: 27cdd53ea8
Former-commit-id: 11c506f14d [formerly f2d1f2b3c0] [formerly 7a4f952c9e] [formerly 5b832381712e795e095d5fdb6af2b6306de34680 [formerly b9d777217ece12358aa9bd323f1f43b1d39a9ed4] [formerly 7a4f952c9e [formerly 0adb2897fb]]]
Former-commit-id: 7f97a68fad8c472de58e00a350a7677cf74150fe [formerly 46ffeb57e2a5d53a0b761a32992e29820952072c] [formerly c8e36c93c4 [formerly 2f799919a6]]
Former-commit-id: c8e36c93c4
Former-commit-id: 5027682b48
|
2014-10-10 12:05:16 -04:00 |
|
Benjamin Phillippe
|
64c2bf5bc9
|
Omaha #3718 Restored data delivery subscription backup web page
Change-Id: I87c40d3476068eef80cee8bdb47b41fa96539734
Former-commit-id: b95401f067 [formerly 7e7b270f68] [formerly a7d5db57d8] [formerly a7d5db57d8 [formerly 825aa0d5b2]] [formerly b95401f067 [formerly 7e7b270f68] [formerly a7d5db57d8] [formerly a7d5db57d8 [formerly 825aa0d5b2]] [formerly df6b3b3832 [formerly a7d5db57d8 [formerly 825aa0d5b2] [formerly df6b3b3832 [formerly f7c7fe2f7b845563335559839a832b26c2ad2b2a]]]]]
Former-commit-id: df6b3b3832
Former-commit-id: 72ddf34939 [formerly 668d74c0b9] [formerly 48f13629a7] [formerly 2cdae3e6d5e1a5b31bfc01a37e30795815ed7b02 [formerly f7fd64476307bf7d8c21d3cde879579426f25b91] [formerly 48f13629a7 [formerly d7c1c5805f]]]
Former-commit-id: 44f31e7d40911835e058742e02a852cbc6b29fd9 [formerly 65f36073234960b8a0fad1f1f66ab03f6092e7c9] [formerly ad58fdbb57 [formerly e2ec6c4a0b]]
Former-commit-id: ad58fdbb57
Former-commit-id: 3dde5802f1
|
2014-10-10 10:59:16 -05:00 |
|
Nathan Bowler
|
4f46194314
|
Omaha #3595 Adding original, unmodified raobs scripts.
Change-Id: I466b5b89790bff9887022a35deda7c9f9871bc80
Former-commit-id: f4d74cc0c0 [formerly 544b2f9fbc] [formerly 5e5256fca1] [formerly 5e5256fca1 [formerly 104b47daa2]] [formerly f4d74cc0c0 [formerly 544b2f9fbc] [formerly 5e5256fca1] [formerly 5e5256fca1 [formerly 104b47daa2]] [formerly 4241eab8ac [formerly 5e5256fca1 [formerly 104b47daa2] [formerly 4241eab8ac [formerly d6793fc17662a0ea0d5814524f4e641e1524ebde]]]]]
Former-commit-id: 4241eab8ac
Former-commit-id: d965d03ca9 [formerly 15b53bfdea] [formerly 939e8a4736] [formerly 949c9a394a5dff9b7321a34a7e1a2a31f692f30d [formerly 3de4554ead51c602dafcca7b1824049f3402c073] [formerly 939e8a4736 [formerly aa36802cdf]]]
Former-commit-id: c509cd47348ac01ff061e6e2e1ca8df6ff6b2fb4 [formerly 75f7dcfdf94642ea6815ee21fcb23c29f72bedc6] [formerly e343c017fb [formerly 0f5499d93c]]
Former-commit-id: e343c017fb
Former-commit-id: 33fde84e1b
|
2014-10-10 11:33:07 -04:00 |
|
Nate Jensen
|
01fb3e4407
|
Omaha #3549 remove unnecessary @Column annotations from TextRecord
Change-Id: I5f36baf0c7b697782379bef0dd5c28d8cb60e77e
Former-commit-id: 7a4dada8a6 [formerly 81aab98b59] [formerly 974113a995] [formerly 974113a995 [formerly afb64bc4bb]] [formerly 7a4dada8a6 [formerly 81aab98b59] [formerly 974113a995] [formerly 974113a995 [formerly afb64bc4bb]] [formerly b638e6e0f6 [formerly 974113a995 [formerly afb64bc4bb] [formerly b638e6e0f6 [formerly 4a5b66b00fbb53b4fcb4340366347ae4b08e6992]]]]]
Former-commit-id: b638e6e0f6
Former-commit-id: 4ec3a4cb33 [formerly 06562ee894] [formerly 57fac3e239] [formerly e5fecd638bb136047f1a0054ca5bb66bee7c929d [formerly ab8c772c1836403daf9582dcbf7068fc1f188629] [formerly 57fac3e239 [formerly c552655866]]]
Former-commit-id: fd1e3b295d91dff886d745700199b6ead3b06d6e [formerly 178b7541fab5b6fa0d9a1ac9c733a247efaea480] [formerly 753bb66398 [formerly e3eb361995]]
Former-commit-id: 753bb66398
Former-commit-id: 92e3be5998
|
2014-10-10 09:01:29 -05:00 |
|
Nate Jensen
|
186fc98f0d
|
Merge "Omaha #3644 Remove dataURI from ccfp plugin" into omaha_14.4.1
Former-commit-id: f5b3605208 [formerly 5ca72c6d2a] [formerly d10d25e425] [formerly d10d25e425 [formerly 3cc3b38539]] [formerly f5b3605208 [formerly 5ca72c6d2a] [formerly d10d25e425] [formerly d10d25e425 [formerly 3cc3b38539]] [formerly ee51fe1977 [formerly d10d25e425 [formerly 3cc3b38539] [formerly ee51fe1977 [formerly 8a0cf09901a2ffec4b67bc1d993a4c545bffa8bc]]]]]
Former-commit-id: ee51fe1977
Former-commit-id: 7476c0caa2 [formerly 48172cbed6] [formerly 3cca074583] [formerly edd9958338487b08a5ad35274c09e307d4a015ea [formerly a6bce9777358808eafaedf51cd9e0f1fd2b9d780] [formerly 3cca074583 [formerly 2c17405d5f]]]
Former-commit-id: f2d7ef698f65da12ec9723809cd5b146f946cb3b [formerly df863c9db18720a854169e46a9728e958bcac43d] [formerly b2d2db7eb2 [formerly 9098eaac2a]]
Former-commit-id: b2d2db7eb2
Former-commit-id: 0e3867463e
|
2014-10-09 18:30:33 -05:00 |
|
Nate Jensen
|
29c51b8dbd
|
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: d092263867 [formerly 0e35dfff77] [formerly f70c9deacb] [formerly f70c9deacb [formerly 13f4746613]] [formerly d092263867 [formerly 0e35dfff77] [formerly f70c9deacb] [formerly f70c9deacb [formerly 13f4746613]] [formerly 22fce26b0e [formerly f70c9deacb [formerly 13f4746613] [formerly 22fce26b0e [formerly 7751e4e17ac543ba18abbd3ba7f2355c13c81d4e]]]]]
Former-commit-id: 22fce26b0e
Former-commit-id: ee55360c63 [formerly e701cbe453] [formerly c554ce1713] [formerly 00046a8674fc1758a59dd4eafb1a4065f6fb84ba [formerly 63f554767cc2e844b660d6897f7bd483b503f8a3] [formerly c554ce1713 [formerly c3d936373f]]]
Former-commit-id: 2d2d961617dd36a10d66408dcf1734d952529347 [formerly 07f1f239af24b0018501aed0d3d11b82bb7d4e04] [formerly 6bbfc99a98 [formerly cdd730fe6b]]
Former-commit-id: ebe0e69bac88de5069ff596d1fa9eab93e28aaf7 [formerly 6bbfc99a98]
Former-commit-id: 519bd8f292
|
2014-10-09 15:32:38 -05:00 |
|
Mark Peters
|
2be8bffe20
|
Omaha #3644 Remove dataURI from ccfp plugin
Change-Id: I35e2e9239e6059f64c444d173b0a745d889abc27
Former-commit-id: d6548c9fdd [formerly 94364ab115] [formerly c20d19a2d3] [formerly c20d19a2d3 [formerly cf1bff0d02]] [formerly d6548c9fdd [formerly 94364ab115] [formerly c20d19a2d3] [formerly c20d19a2d3 [formerly cf1bff0d02]] [formerly 6bb4f5dbdf [formerly c20d19a2d3 [formerly cf1bff0d02] [formerly 6bb4f5dbdf [formerly 3eaa3fa11068cbf6d1a58d4eb414f52f243bbaea]]]]]
Former-commit-id: 6bb4f5dbdf
Former-commit-id: f78367e80d [formerly ed61a1a3a8] [formerly 95a34bd053] [formerly 657fa1c19fec561b38509cc69321207f723bc723 [formerly bab42edcd9b274b3abc3f6b16f3cfd76ddf324dc] [formerly 95a34bd053 [formerly 5b5fac85b8]]]
Former-commit-id: 7fed8d6a85f0db18cc582759697172bac3195239 [formerly ed09793cc93fee4c1805bf02118b29ade7b0bf80] [formerly c906433c99 [formerly c3665bccd9]]
Former-commit-id: 46aeb0270aaafb08a854053d57f89cbc44c5222a [formerly c906433c99]
Former-commit-id: b026ccef45
|
2014-10-09 15:30:23 -05:00 |
|
Mark Peters
|
b9e150994d
|
Omaha #3629 Fix null pointer exceptions from matchElement() replacements
Change-Id: I9fcf81c5179f099c1813f0fa1086c85bdcff4513
Former-commit-id: 8488f11ac0 [formerly 99b25a3031] [formerly 7f3eb45256] [formerly 7f3eb45256 [formerly 087dabe3bb]] [formerly 8488f11ac0 [formerly 99b25a3031] [formerly 7f3eb45256] [formerly 7f3eb45256 [formerly 087dabe3bb]] [formerly 63069f5adc [formerly 7f3eb45256 [formerly 087dabe3bb] [formerly 63069f5adc [formerly e0330ab61d027ee3b8512230b64000bb7f3d71f1]]]]]
Former-commit-id: 63069f5adc
Former-commit-id: 5e26af222d [formerly 619db846e1] [formerly 1af7b2d388] [formerly 1f744a3ca5d8ca175ea4cd938b867ce8aaf4200b [formerly 29833ce73d0fdbb27149d63267e22cbd07a4baf2] [formerly 1af7b2d388 [formerly bcb39bffb5]]]
Former-commit-id: 64a935316da717e6f16894416771365c0070b38f [formerly 639296e40463ea00ebc336707de18299d1f27a62] [formerly 4864414e11 [formerly a87212a8d7]]
Former-commit-id: 4864414e11
Former-commit-id: b49a553f6a
|
2014-10-09 11:17:53 -05:00 |
|
Richard Peter
|
53247886e2
|
Merge "Omaha #3675 alertviz cleanly exits when killed by signal" into omaha_14.4.1
Former-commit-id: 4dd9914e2a [formerly fddf14712a] [formerly db0e85e501] [formerly db0e85e501 [formerly ed2bd7a261]] [formerly 4dd9914e2a [formerly fddf14712a] [formerly db0e85e501] [formerly db0e85e501 [formerly ed2bd7a261]] [formerly 26e4c16da4 [formerly db0e85e501 [formerly ed2bd7a261] [formerly 26e4c16da4 [formerly 5977e37b7368487867aca1cfdd362943633f92eb]]]]]
Former-commit-id: 26e4c16da4
Former-commit-id: 82452d0296 [formerly a3a6b0a554] [formerly e71b0562b5] [formerly c6b470ac35279702752b6bc896b824ef6afe4dae [formerly d2e0631fa3248d80703a209983c63962831939c8] [formerly e71b0562b5 [formerly bdb3bb263d]]]
Former-commit-id: a1f1b7c9340c750746ac857d0ce47d80aff39590 [formerly df60de25e6bd0dd52c1aba0d041f5e2f0cde4782] [formerly 6f4a6c7f6d [formerly bcc3432a9d]]
Former-commit-id: 6f4a6c7f6d
Former-commit-id: 6c2cfadf4c
|
2014-10-09 11:09:32 -05:00 |
|
Brian Clements
|
e5121b8685
|
Omaha #3675 alertviz cleanly exits when killed by signal
Change-Id: I0ef7c8936558ccd8b927edb64143315afcb04631
Former-commit-id: a09bf85195 [formerly 2112fb8e60] [formerly 8d58b8d524] [formerly 8d58b8d524 [formerly 119b2bff17]] [formerly a09bf85195 [formerly 2112fb8e60] [formerly 8d58b8d524] [formerly 8d58b8d524 [formerly 119b2bff17]] [formerly fbabf6f18d [formerly 8d58b8d524 [formerly 119b2bff17] [formerly fbabf6f18d [formerly 6bc42c58541363bee9be1607b1bdf2aca6f5a000]]]]]
Former-commit-id: fbabf6f18d
Former-commit-id: e60eb31b2c [formerly f7715d0c3b] [formerly fa7a3e2e43] [formerly 2bd6fcd764b1c82d25cd5f3d812c860e35373374 [formerly df78f5c496a36155869321af4867e6ab03d2ffb0] [formerly fa7a3e2e43 [formerly 6be495b787]]]
Former-commit-id: 9d8b7adaf2603d5dfd0b0a86a15f9b51e4eb95c1 [formerly b11048de8d398d05a7747684f0268aa35724516e] [formerly 0aa5f80ca8 [formerly f9e4622db7]]
Former-commit-id: 0aa5f80ca8
Former-commit-id: a8ee8adbad
|
2014-10-09 11:04:49 -05:00 |
|
Nate Jensen
|
e1544b04be
|
Merge "Omaha #3705 added collaboration public room search, bookmarking" into omaha_14.4.1
Former-commit-id: 942097d16c [formerly 91ba36db75] [formerly 550b269370] [formerly 550b269370 [formerly f6601e4ee1]] [formerly 942097d16c [formerly 91ba36db75] [formerly 550b269370] [formerly 550b269370 [formerly f6601e4ee1]] [formerly 1a24808709 [formerly 550b269370 [formerly f6601e4ee1] [formerly 1a24808709 [formerly 05a008ed69414e3977998cca45516a736181d5b6]]]]]
Former-commit-id: 1a24808709
Former-commit-id: 5ed06f4e91 [formerly c14691cba1] [formerly f3c1ca00d2] [formerly 2f0d249e131f7cf751186639b941166e54deedd2 [formerly 024f1c40cc395ad17cece7abc6f869ff6b39b5de] [formerly f3c1ca00d2 [formerly 145db4077e]]]
Former-commit-id: 7240478680ae9b85f409332ef13f5156ee87f119 [formerly e83aebdfadbb6cd359c4c1a685edfb2e2319fd36] [formerly c9e949c8bd [formerly 17971ea0b6]]
Former-commit-id: c9e949c8bd
Former-commit-id: 4b7163ff79
|
2014-10-09 09:38:27 -05:00 |
|
Nate Jensen
|
8e0af2107d
|
Merge "Omaha #3672 moved aviation advisory plugins to separate feature" into omaha_14.4.1
Former-commit-id: 6d25456d08 [formerly d36751c260] [formerly 87d33ff6ca] [formerly 87d33ff6ca [formerly 0d33e661f2]] [formerly 6d25456d08 [formerly d36751c260] [formerly 87d33ff6ca] [formerly 87d33ff6ca [formerly 0d33e661f2]] [formerly 98518f4cb6 [formerly 87d33ff6ca [formerly 0d33e661f2] [formerly 98518f4cb6 [formerly 5ae10ba1a54ec5b20d1569d6c78c2762015c35de]]]]]
Former-commit-id: 98518f4cb6
Former-commit-id: c5f798747b [formerly 4db5642bd0] [formerly 6851264338] [formerly d1b0e847c6995579a52d2f45a633342cd79f222c [formerly 75c66f217107e5e8b2a39939209f323c3da00152] [formerly 6851264338 [formerly 2a962aedf7]]]
Former-commit-id: 92adf197017d8395acef7161369d878c8ddd14dd [formerly 86930d7e425e0216b1184a4910d2036def52b808] [formerly 873cf49d2e [formerly 96933e89a7]]
Former-commit-id: 873cf49d2e
Former-commit-id: 45713940b4
|
2014-10-09 09:02:36 -05:00 |
|
Brian Clements
|
5d7d78dec0
|
Omaha #3705 added collaboration public room search, bookmarking
Change-Id: I298254111d1eb305820c313ebe176f091fe7a818
Former-commit-id: 21a828d75c [formerly abb6b1f258] [formerly 1a6624d5d7] [formerly 1a6624d5d7 [formerly 87964cb500]] [formerly 21a828d75c [formerly abb6b1f258] [formerly 1a6624d5d7] [formerly 1a6624d5d7 [formerly 87964cb500]] [formerly f0921db20c [formerly 1a6624d5d7 [formerly 87964cb500] [formerly f0921db20c [formerly 919c816ba7af2082b9dcb0308128fa1b228475d2]]]]]
Former-commit-id: f0921db20c
Former-commit-id: ea675872d5 [formerly 49e6579115] [formerly d7c864113c] [formerly 56ee0eafe4cf1c6cb941f4dfeb0be40185149bc9 [formerly d5b69cedb564d53bd3cab131f05d49d804074b08] [formerly d7c864113c [formerly eac32a0fa0]]]
Former-commit-id: c8e7b2534003b0711c2574f2eeb0250316e39c01 [formerly 219ae40cec22d5a5e877b7c88ca0a55315f52516] [formerly 51084e6548 [formerly 72c5dd03d2]]
Former-commit-id: 51084e6548
Former-commit-id: dc45bb7100
|
2014-10-09 08:38:45 -05:00 |
|
Brian Clements
|
6d3cef1364
|
Omaha #3672 moved aviation advisory plugins to separate feature
Change-Id: I7a71eceb14bba27648260e873aeef38982c6084f
Former-commit-id: a576fe7687 [formerly 84217692bf] [formerly 4a824111ec] [formerly 4a824111ec [formerly 8a4cda892f]] [formerly a576fe7687 [formerly 84217692bf] [formerly 4a824111ec] [formerly 4a824111ec [formerly 8a4cda892f]] [formerly 577b3a5e11 [formerly 4a824111ec [formerly 8a4cda892f] [formerly 577b3a5e11 [formerly 771e06df242b0fe7b4eec1e7c3099dfd316182ce]]]]]
Former-commit-id: 577b3a5e11
Former-commit-id: fc6e76c61b [formerly fbffc63d5a] [formerly 6ad5c3088d] [formerly 5ee0a8c643db74954b86567f35677b205fdf97df [formerly 4cc2a0452da8ecf06e249d8ed7253d57b4357a97] [formerly 6ad5c3088d [formerly 2de14cf885]]]
Former-commit-id: 10e4bbd400f8c5a15ea0f624e0862c6210fe48d5 [formerly 4ab31ef1abb0d696f1850c3f5c7dd3a3e55add19] [formerly 3624ea94dc [formerly 8ec3f473d7]]
Former-commit-id: 3624ea94dc
Former-commit-id: 0be119b360
|
2014-10-08 16:47:10 -05:00 |
|
Robert Blum
|
35186d54e5
|
Omaha #3706 Adding auto-generated python files to gain region lookup functionality by using regions.xml.
Change-Id: Ifee9297729b814983634d438bff355f6eddb0008
Former-commit-id: bbcb4f18bc [formerly da4f5de40f] [formerly caee4eba19] [formerly caee4eba19 [formerly 9bef0b91f8]] [formerly bbcb4f18bc [formerly da4f5de40f] [formerly caee4eba19] [formerly caee4eba19 [formerly 9bef0b91f8]] [formerly f8661bdb73 [formerly caee4eba19 [formerly 9bef0b91f8] [formerly f8661bdb73 [formerly 8c609041f3cabc11588d282b0a91b514a569073a]]]]]
Former-commit-id: f8661bdb73
Former-commit-id: 74f821f801 [formerly 7023892239] [formerly 58d4b90920] [formerly 2d2662bf41eed4368e7c7d55e3aac893976e75bc [formerly ca938621e5e22a7d3ede60b023930d1d80849b48] [formerly 58d4b90920 [formerly 153fdb982f]]]
Former-commit-id: 135fa050cdaf1c17766957b6a6d4351d5e4ea223 [formerly e436a49aa33b5a2de79281f279c0843d92c4a5ba] [formerly 869d81c170 [formerly d18cb00dc1]]
Former-commit-id: 869d81c170
Former-commit-id: fbd1a740f6
|
2014-10-08 13:05:23 -05:00 |
|
Ben Steffensmeier
|
328e3e6b36
|
Omaha #3674 Fix a few viirs projection bugs.
Former-commit-id: 97df861ee0 [formerly 9d233500c8] [formerly 314014503f] [formerly 314014503f [formerly b7c0eb89ad]] [formerly 97df861ee0 [formerly 9d233500c8] [formerly 314014503f] [formerly 314014503f [formerly b7c0eb89ad]] [formerly b865762b4f [formerly 314014503f [formerly b7c0eb89ad] [formerly b865762b4f [formerly e0ec387c62e64a19a4d598578f18ee17686f312a]]]]]
Former-commit-id: b865762b4f
Former-commit-id: 33eac658a5 [formerly 4db5a06fc1] [formerly ea47d859c6] [formerly b9f152137bf7b037ecd17d6dbbcf5e09919d92b1 [formerly 0a67866e2eee8e629df81d359675f34427353f58] [formerly ea47d859c6 [formerly 44d2085dad]]]
Former-commit-id: edb71487805ffbf5d9163a8006c1b9d2d8994ad2 [formerly 87ebb5cd2485e8cc312bbe5c405fb72dede7f650] [formerly f850818be8 [formerly 254c1e7130]]
Former-commit-id: f850818be8
Former-commit-id: fbef627949
|
2014-10-08 12:21:03 -05:00 |
|
Richard Peter
|
b0861de168
|
Merge "Omaha #3300 Merge conflict resolution with old Vbsources.xml." into omaha_14.4.1
Former-commit-id: 190c363e32 [formerly a4fd6b8a09] [formerly 04bf8666b3] [formerly 04bf8666b3 [formerly e8bc97501b]] [formerly 190c363e32 [formerly a4fd6b8a09] [formerly 04bf8666b3] [formerly 04bf8666b3 [formerly e8bc97501b]] [formerly fa15d4ff21 [formerly 04bf8666b3 [formerly e8bc97501b] [formerly fa15d4ff21 [formerly 157588d388b9033424ddc46a22d74ccc302eea85]]]]]
Former-commit-id: fa15d4ff21
Former-commit-id: b80dfb4ba8 [formerly 422a457e9e] [formerly baabb4a12f] [formerly bfc45bfc127bae6417fb67921764bf67ffa78544 [formerly 7a305bc6129c81c773d00eed85f56a1759d93cfa] [formerly baabb4a12f [formerly d97655272f]]]
Former-commit-id: 000e8c6866754d8f90305c156e693894f86ed4c9 [formerly 867a14e53bc275209f6bf4d3d19485de51ca196e] [formerly e5b9aa8b3f [formerly 26ee8506f5]]
Former-commit-id: e78e0ae691bc60dc75a79f808f09f54705398930 [formerly e5b9aa8b3f]
Former-commit-id: d215cc7fcb
|
2014-10-08 12:02:17 -05:00 |
|
Nate Jensen
|
315b8003e2
|
Merge "Omaha #3398 moved user and userid to core" into omaha_14.4.1
Former-commit-id: d4447536e4 [formerly 5886518b3b] [formerly 2502976504] [formerly 2502976504 [formerly 4e582d0bde]] [formerly d4447536e4 [formerly 5886518b3b] [formerly 2502976504] [formerly 2502976504 [formerly 4e582d0bde]] [formerly 5cf1821a6a [formerly 2502976504 [formerly 4e582d0bde] [formerly 5cf1821a6a [formerly 87f49d9bcc07d2178a535fc934d02cab36063894]]]]]
Former-commit-id: 5cf1821a6a
Former-commit-id: ae4c22dba6 [formerly 8b8899fc2e] [formerly 53c464b647] [formerly 1be5a6794006a09f823e5f0f8b9a2336c44ad924 [formerly 789872670a0650c9c9b581c9d0d67b2ee58b08c5] [formerly 53c464b647 [formerly 32fda0ae19]]]
Former-commit-id: 2ab724cdd91b4967bf9c9c79a7b16030e62ece39 [formerly d23f99ce9a984fc9d497dfcf6c906ac83a827ad2] [formerly a3f23422a7 [formerly 9135b7458f]]
Former-commit-id: a3f23422a7
Former-commit-id: 6a60c19497
|
2014-10-08 11:36:44 -05:00 |
|
Nate Jensen
|
39e7be7baa
|
Merge "Omaha #3594 Update profiler script to use DAF." into omaha_14.4.1
Former-commit-id: 8efd0bf9d6 [formerly 460a7e917f] [formerly f2db612cd3] [formerly f2db612cd3 [formerly aa9567ccbe]] [formerly 8efd0bf9d6 [formerly 460a7e917f] [formerly f2db612cd3] [formerly f2db612cd3 [formerly aa9567ccbe]] [formerly ea23c651a1 [formerly f2db612cd3 [formerly aa9567ccbe] [formerly ea23c651a1 [formerly 617994f10079a9b905f37c1bf1c1b83e6a210e61]]]]]
Former-commit-id: ea23c651a1
Former-commit-id: 5f0f2123d2 [formerly 92b114a261] [formerly 3163618c59] [formerly 1b08f439da9c4ea31794f84e7990bf67cb00c102 [formerly 46563d9ac2743d4b39d07ef20f91dfe7d3375cd1] [formerly 3163618c59 [formerly affddd1b8b]]]
Former-commit-id: 335c837e61420e4c53b713fc729e912023221a36 [formerly a7fd83687d96f291afdb8eb3d6bd225b58ed0183] [formerly f3e8860a8d [formerly 17b6410a1c]]
Former-commit-id: f3e8860a8d
Former-commit-id: 1c3aa82d84
|
2014-10-07 17:18:51 -05:00 |
|
Richard Peter
|
1b1efa8e71
|
Omaha #3300 Fix merge of OB_14.3.1-25m
Change-Id: Ia9afe6316f3dac301caf97a6868d1baaf179f632
Former-commit-id: 597866865f [formerly 8ffa01471a] [formerly f5dd25c8e4] [formerly f5dd25c8e4 [formerly a4bfd2d28b]] [formerly 597866865f [formerly 8ffa01471a] [formerly f5dd25c8e4] [formerly f5dd25c8e4 [formerly a4bfd2d28b]] [formerly a9562d992c [formerly f5dd25c8e4 [formerly a4bfd2d28b] [formerly a9562d992c [formerly 110499cec453532545431a6fa05057f47af66ed2]]]]]
Former-commit-id: a9562d992c
Former-commit-id: 542fd8501d [formerly c217191493] [formerly 901877ec7a] [formerly afffe6e8cf0c68be01612e17a9bf06e9a07f98a4 [formerly 10f0ab60c2c0a25fca107e20817d044f303c4afe] [formerly 901877ec7a [formerly 1be207dccb]]]
Former-commit-id: 8c7be215efd21e91ef3b2eb0fd30c0eab5ce717c [formerly 0119dd744b38196e2ed0f52406b1c9c17f175d11] [formerly 3998dac2f0 [formerly 1ec3bdd877]]
Former-commit-id: 3998dac2f0
Former-commit-id: a936b8612b
|
2014-10-07 16:32:48 -05:00 |
|
Richard Peter
|
3b1ca283a3
|
Merge "Omaha #3702 register database plugin to fxa database." into omaha_14.4.1
Former-commit-id: 82280a1f38 [formerly 1038af1901] [formerly ee86734625] [formerly ee86734625 [formerly 1adac05f5a]] [formerly 82280a1f38 [formerly 1038af1901] [formerly ee86734625] [formerly ee86734625 [formerly 1adac05f5a]] [formerly 1bc24c3be2 [formerly ee86734625 [formerly 1adac05f5a] [formerly 1bc24c3be2 [formerly 0ceea4d3d7e36160a70ea9f7f5256d94cd2778b5]]]]]
Former-commit-id: 1bc24c3be2
Former-commit-id: 3781c4b08c [formerly e660a61fa9] [formerly 4f056d76c8] [formerly 2bbcaa94dc86cdcd5d39a57ffd8ea8fd079e8e6e [formerly dcfabbc95e67fec2343f8bc01a273a0ef2f97589] [formerly 4f056d76c8 [formerly c6cb389a3d]]]
Former-commit-id: 831d2e5edba4dc20d1806bd8ce522a78003283b7 [formerly fee614f33d7cd6e30009bae10026ea09adbfa457] [formerly 7bb803b504 [formerly 327d82ed02]]
Former-commit-id: 7bb803b504
Former-commit-id: 9f372715f5
|
2014-10-07 15:13:11 -05:00 |
|
Nathan Bowler
|
8d3b951520
|
Omaha #3594 Update profiler script to use DAF.
Change-Id: Id0553c1c8745ae4371776fcdb4ec610f8f142ab0
Former-commit-id: 41fda1a53c [formerly 1c7dbefc31] [formerly 8e3ef542bf] [formerly 8e3ef542bf [formerly 1fd0ece81a]] [formerly 41fda1a53c [formerly 1c7dbefc31] [formerly 8e3ef542bf] [formerly 8e3ef542bf [formerly 1fd0ece81a]] [formerly e7f86f19c1 [formerly 8e3ef542bf [formerly 1fd0ece81a] [formerly e7f86f19c1 [formerly 3c55fd78ca42a04ee0b0a9bbb88034c83f30e583]]]]]
Former-commit-id: e7f86f19c1
Former-commit-id: 52bc34c9a3 [formerly a243aa93d2] [formerly db1c0f21b6] [formerly 227217af1d63c3daf49872eb3158b45eb2c4f291 [formerly 309aadf808d732273707976d97d0deeeae187624] [formerly db1c0f21b6 [formerly a23f95abdc]]]
Former-commit-id: fad14eb8c54299884239a4be7a1bf54bc24e51ad [formerly 02f18d33b32654a6338f29a2f7c5a7710bc5f782] [formerly 658f943995 [formerly eaf614ae66]]
Former-commit-id: 658f943995
Former-commit-id: a53fa83f99
|
2014-10-07 15:23:38 -04:00 |
|
Nate Jensen
|
281516837d
|
Merge "Omaha #3668 grid data request uses thread pool" into omaha_14.4.1
Former-commit-id: df3ba0b4d0 [formerly 92caee5227] [formerly 0bfc7514a4] [formerly 0bfc7514a4 [formerly 70521e80f8]] [formerly df3ba0b4d0 [formerly 92caee5227] [formerly 0bfc7514a4] [formerly 0bfc7514a4 [formerly 70521e80f8]] [formerly 6d0d6c2a96 [formerly 0bfc7514a4 [formerly 70521e80f8] [formerly 6d0d6c2a96 [formerly a75ecea2121d1c030a7acb4ba50095a6d2769c01]]]]]
Former-commit-id: 6d0d6c2a96
Former-commit-id: f0271b7d1d [formerly c988ab129d] [formerly 52e7dd82c0] [formerly 10d35a7a2b0fe327377d506cf1936c816fb7be7b [formerly 81b7914b3094bd0fe354bbbce1e009bec017a6d9] [formerly 52e7dd82c0 [formerly 5051b47832]]]
Former-commit-id: 058d9784163a0c7e6577091683415bdb110fe7a1 [formerly c981b036f8f82e3cfc80ab10d981704f1af2defc] [formerly 4126b426eb [formerly 541e10e9d6]]
Former-commit-id: 4126b426eb
Former-commit-id: 85774367dc
|
2014-10-07 13:54:08 -05:00 |
|
Nate Jensen
|
852e968fd1
|
Merge "Omaha #3690 added tool to remove empty localization dirs" into omaha_14.4.1
Former-commit-id: 0f4da06d5e [formerly 056dbe465d] [formerly affc326eb7] [formerly affc326eb7 [formerly 11f460f876]] [formerly 0f4da06d5e [formerly 056dbe465d] [formerly affc326eb7] [formerly affc326eb7 [formerly 11f460f876]] [formerly 726eea342f [formerly affc326eb7 [formerly 11f460f876] [formerly 726eea342f [formerly cdeea610953d82fe2b380341b3059b15b6ecd1ff]]]]]
Former-commit-id: 726eea342f
Former-commit-id: 9e39ad3b28 [formerly 639938641e] [formerly 4267d54502] [formerly 05e9fa1f6585d658c89c85815c3ca316448a4d6c [formerly 2387192aa4c7f8ef68f1f17c0f603131fa1338e6] [formerly 4267d54502 [formerly 557c040868]]]
Former-commit-id: 1c5cfc861ddefa9f11fa47040ef1d60948843fd1 [formerly d82f0ba325f8130d4a49ac6126ba1b31a9438658] [formerly 12e3c3ff75 [formerly bf0eb369b3]]
Former-commit-id: 12e3c3ff75
Former-commit-id: 7091f791d8
|
2014-10-07 13:53:43 -05:00 |
|
Nate Jensen
|
88e1f5eed3
|
Merge "Omaha #2618 Deleted points don't get removed from the selected list" into omaha_14.4.1
Former-commit-id: b28c4eef82 [formerly 3e4434f708] [formerly e63de52465] [formerly e63de52465 [formerly c066e8264d]] [formerly b28c4eef82 [formerly 3e4434f708] [formerly e63de52465] [formerly e63de52465 [formerly c066e8264d]] [formerly b0f025c0df [formerly e63de52465 [formerly c066e8264d] [formerly b0f025c0df [formerly 60155e8f96ba20204c6049206ef35a840f64a767]]]]]
Former-commit-id: b0f025c0df
Former-commit-id: d11bc4b139 [formerly dec72bc6c5] [formerly 0b10454635] [formerly 2cef871d3b1903a64752d28b5c0b0c6dae8f6a8c [formerly ce928a70b87a81dd02c2e04fea570e6de94ae2ba] [formerly 0b10454635 [formerly b63050a0e9]]]
Former-commit-id: 787ae1db4fc8255392f112d995aa5f0121222ce8 [formerly dcfc7a4fcee1eaad28a80eb0597e7899bfdb5d34] [formerly 6e2dc7f7d3 [formerly 416a45b417]]
Former-commit-id: 6e2dc7f7d3
Former-commit-id: 6ab10f279f
|
2014-10-07 13:53:33 -05:00 |
|
Nate Jensen
|
46d0231079
|
Merge "Omaha #3594 Add original, unaltered Profiler scripts." into omaha_14.4.1
Former-commit-id: 0c69631a70 [formerly 860f584065] [formerly e3a1adb7f2] [formerly e3a1adb7f2 [formerly 1e16abcfcd]] [formerly 0c69631a70 [formerly 860f584065] [formerly e3a1adb7f2] [formerly e3a1adb7f2 [formerly 1e16abcfcd]] [formerly 09cf5de2dd [formerly e3a1adb7f2 [formerly 1e16abcfcd] [formerly 09cf5de2dd [formerly 747f8fc91e2ff977724f634b6e610c96150cb4ad]]]]]
Former-commit-id: 09cf5de2dd
Former-commit-id: 0d535d61f2 [formerly 6140e0ac31] [formerly 38be3b94b7] [formerly 1dc2c280ffbba701f8193b5256f66da9650ecb71 [formerly 63c392ca022a0f6f7cd0160df10fa464a320d98c] [formerly 38be3b94b7 [formerly 0425092c20]]]
Former-commit-id: d95d91a2104909fc08ce2aec83bedec08ecd1482 [formerly bcbd1ce36eab868fcf0039397ea58b61fbb7e349] [formerly 4ff50c4c86 [formerly ef4883bda6]]
Former-commit-id: 9f4c04906c757a3efd23f763d227146dada3cd5f [formerly 4ff50c4c86]
Former-commit-id: f99ca416ca
|
2014-10-07 13:52:36 -05:00 |
|
Nathan Bowler
|
06b8e60fc3
|
Omaha #3594 Add original, unaltered Profiler scripts.
Change-Id: Iea71e2fa91881c31b67e0f1fb1fd89c8b28da1e9
Former-commit-id: b8ed73ec8b [formerly bcc339a859] [formerly adecc6efa4] [formerly adecc6efa4 [formerly ab2e0edb82]] [formerly b8ed73ec8b [formerly bcc339a859] [formerly adecc6efa4] [formerly adecc6efa4 [formerly ab2e0edb82]] [formerly b84fee6aed [formerly adecc6efa4 [formerly ab2e0edb82] [formerly b84fee6aed [formerly e57506f274da8a2d917c6cf061e789e50993b5c3]]]]]
Former-commit-id: b84fee6aed
Former-commit-id: 653e9ca255 [formerly bbefa2d070] [formerly ab157527b9] [formerly 2ea1666e0e714fa9b4aa3c18ad3c47cad58b4b5f [formerly e72139d992b6a3a44db2b6d03c3f058b6211e9ff] [formerly ab157527b9 [formerly efbe205ba8]]]
Former-commit-id: 4605f31453aebf974df6f8565a2ab1bb42485c26 [formerly 1ef32fcadaac6b057d1ee75e09a6792d30a777c0] [formerly b4da44c655 [formerly 36293c548f]]
Former-commit-id: b4da44c655
Former-commit-id: 00485b4d8c
|
2014-10-07 14:40:49 -04:00 |
|
Steve Harris
|
d407129dba
|
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: 3c91dfd8b7 [formerly c0c1ce7700] [formerly 39b2199cec] [formerly 39b2199cec [formerly ad4393bea3]] [formerly 3c91dfd8b7 [formerly c0c1ce7700] [formerly 39b2199cec] [formerly 39b2199cec [formerly ad4393bea3]] [formerly c9e37bf440 [formerly 39b2199cec [formerly ad4393bea3] [formerly c9e37bf440 [formerly 6bb7a7312a22a9585d2f5981d873751879082cb1]]]]]
Former-commit-id: c9e37bf440
Former-commit-id: 85a84d662d [formerly e80527ade2] [formerly fc424d7336] [formerly fa0b744e662436c2fbdc7bc093ef8e612411dade [formerly 669e99e1efdfc40962f1589446fe9efe4b3f8b52] [formerly fc424d7336 [formerly fc35b7313d]]]
Former-commit-id: 68fd5903e9fff2e0e8a9aea68086bd4cb62bb006 [formerly 292297ad70be43ccc935b96eca7a8409d4033fc4] [formerly 7c4bb336e1 [formerly f370a2f54e]]
Former-commit-id: 7c4bb336e1
Former-commit-id: 118c19a83d
|
2014-10-07 13:35:58 -05:00 |
|
Brian Clements
|
063c0ab2ce
|
Omaha #3668 grid data request uses thread pool
Change-Id: I75023960c89f18b87e1bce5a2063c0c6212005ac
Former-commit-id: 627ed89ca2 [formerly 0cd0db130c] [formerly 48352e964d] [formerly 48352e964d [formerly 66705190b5]] [formerly 627ed89ca2 [formerly 0cd0db130c] [formerly 48352e964d] [formerly 48352e964d [formerly 66705190b5]] [formerly 42cefd3655 [formerly 48352e964d [formerly 66705190b5] [formerly 42cefd3655 [formerly ccd1d646a175e6a2493def2fb3a22d7109e225a7]]]]]
Former-commit-id: 42cefd3655
Former-commit-id: ba6a75d374 [formerly 257c19ee5b] [formerly 64a3e0898c] [formerly cac3485b68d06915359baccaa78cac8ad779b5af [formerly d78e7b959f63f20c32c2c42030847bd3d9091fdb] [formerly 64a3e0898c [formerly 574005859a]]]
Former-commit-id: 161ed8b4cb212f76ab5edf6ec86c6a4a6addb061 [formerly 64ca55ce0cf89a3450ae37ad3fe38be7fd59dd0b] [formerly c56ea85517 [formerly 9b83a97637]]
Former-commit-id: c56ea85517
Former-commit-id: 8edd2ad753
|
2014-10-07 13:28:34 -05:00 |
|
Mark Peters
|
d2917c363e
|
Omaha #2618 Deleted points don't get removed from the selected list
Change-Id: I0c85af77c4c46c825b6f80ace4df9cce759e981e
Former-commit-id: 513224863a [formerly 41a0fa9bfe] [formerly dc27d9252c] [formerly dc27d9252c [formerly 3464751716]] [formerly 513224863a [formerly 41a0fa9bfe] [formerly dc27d9252c] [formerly dc27d9252c [formerly 3464751716]] [formerly 5ed537572a [formerly dc27d9252c [formerly 3464751716] [formerly 5ed537572a [formerly 5f22815ea1ca5a1fbd010f642afe6a83778f6f58]]]]]
Former-commit-id: 5ed537572a
Former-commit-id: d47ad24931 [formerly e66adcd8ff] [formerly 82e2a2bbb5] [formerly 545c9051ebddc9bd4e3d61b26a3fa5c28470c9ce [formerly e8adb61acc7a249cc87878a153cb4b17d34bf566] [formerly 82e2a2bbb5 [formerly c50ae98b5f]]]
Former-commit-id: cd8c268fb362da5e1be71b2c60b9464b705b4b07 [formerly eab6b7d95d209e071ff8f9cbfcee197abb9ff1a3] [formerly dffbaa684d [formerly c2173b1925]]
Former-commit-id: dffbaa684d
Former-commit-id: ba47bfd846
|
2014-10-07 11:42:44 -05:00 |
|
Brian Clements
|
e8c73e60a2
|
Omaha #3398 moved user and userid to core
Change-Id: Id9da2ef25a309c1bbc53f24a59ed2fd1ddbb0407
Former-commit-id: 299a6ddc38 [formerly caaf7f9723] [formerly 2637d1b07f] [formerly 2637d1b07f [formerly 773619f741]] [formerly 299a6ddc38 [formerly caaf7f9723] [formerly 2637d1b07f] [formerly 2637d1b07f [formerly 773619f741]] [formerly ec37971eff [formerly 2637d1b07f [formerly 773619f741] [formerly ec37971eff [formerly a758b7aff6b30194a3180fddffcefa5d019f2ee5]]]]]
Former-commit-id: ec37971eff
Former-commit-id: cb7d7c6578 [formerly 65e1114f26] [formerly 67bece24d4] [formerly 7c0a6b2bd53526c192c63ed2db37e3940e7fd8da [formerly f7a65a072cadad5df1bf6f1cd57ad81fe808004f] [formerly 67bece24d4 [formerly c964fb1e80]]]
Former-commit-id: e8ec52c4d6012e0e2cad5ffc9eb6a4b3215d8dc2 [formerly 728fb5fa3a6f593dbe3aaa7dfd1eb72f5ccd01b3] [formerly eda2463f7e [formerly c148e3e56f]]
Former-commit-id: eda2463f7e
Former-commit-id: 0bfcdec3d4
|
2014-10-07 10:43:47 -05:00 |
|
Brian Clements
|
ced3798518
|
Omaha #3690 added tool to remove empty localization dirs
Change-Id: Id5ec16147d9f159fa17645da79d29d1f5cbaa701
Former-commit-id: 9c6346b701 [formerly c0544fa109] [formerly 090a787f8d] [formerly 090a787f8d [formerly f39ffcc63f]] [formerly 9c6346b701 [formerly c0544fa109] [formerly 090a787f8d] [formerly 090a787f8d [formerly f39ffcc63f]] [formerly 81c73519c2 [formerly 090a787f8d [formerly f39ffcc63f] [formerly 81c73519c2 [formerly a69773742e571a334ef1fd000ff8311805f9c737]]]]]
Former-commit-id: 81c73519c2
Former-commit-id: 5abdff0379 [formerly 6dab387f3c] [formerly 260b3bab88] [formerly d58a81de2557b04289189aa002a3675836f18d52 [formerly 3c9950192a8e0eb2869d1aeb1f303e772bec509d] [formerly 260b3bab88 [formerly c3d7cd6e7f]]]
Former-commit-id: 0a7838e8b4c56494ae54428ef9291f45b9fac612 [formerly d975eccba6c6070192220b506e523400d2d337d6] [formerly 49bb8437f6 [formerly 639b2c2510]]
Former-commit-id: 49bb8437f6
Former-commit-id: 1fc61f30c4
|
2014-10-07 08:37:47 -05:00 |
|
Ben Steffensmeier
|
6e20ab6813
|
Omaha #3702 register database plugin to fxa database.
Former-commit-id: 6cb8679704 [formerly d5888d403c] [formerly 3e0a99aed2] [formerly 3e0a99aed2 [formerly 6a2b2efb1a]] [formerly 6cb8679704 [formerly d5888d403c] [formerly 3e0a99aed2] [formerly 3e0a99aed2 [formerly 6a2b2efb1a]] [formerly 997bfd689d [formerly 3e0a99aed2 [formerly 6a2b2efb1a] [formerly 997bfd689d [formerly 7fa6925c27330262dd0a70afcb77c589718cf1f7]]]]]
Former-commit-id: 997bfd689d
Former-commit-id: ade9841af2 [formerly 8b52e21a2c] [formerly 77c2dcd170] [formerly 6c735a3d600f3083591fdfb1d32703d8a6403e3a [formerly 0aa3c4d8ca84f5a162f80580a4b8d2c2c45b5ef1] [formerly 77c2dcd170 [formerly 7e910088c9]]]
Former-commit-id: 16a17cb8f7f9c3b5f5310ee088204291953f1df0 [formerly 3d76f3b15915d70bb7dedac57825640ec68bad59] [formerly 8aac93aeed [formerly 1c6068ee84]]
Former-commit-id: 8aac93aeed
Former-commit-id: c25ac7effd
|
2014-10-06 20:00:19 -05:00 |
|
Roger Ferrel
|
c604655e75
|
Omaha #3300 Merge conflict resolution with old Vbsources.xml.
Former-commit-id: 55cce6515f [formerly 50982e8160] [formerly 2f8d5263b9] [formerly 2f8d5263b9 [formerly dfbf07f377]] [formerly 55cce6515f [formerly 50982e8160] [formerly 2f8d5263b9] [formerly 2f8d5263b9 [formerly dfbf07f377]] [formerly d4ef865375 [formerly 2f8d5263b9 [formerly dfbf07f377] [formerly d4ef865375 [formerly be87967bf65bc07af5f89c13bf4cfd8eff9b4db6]]]]]
Former-commit-id: d4ef865375
Former-commit-id: 95054e6f08 [formerly ecec042861] [formerly 05c00c7bc7] [formerly 30cfec7cdb5dcd8ee27eb48f2e00517ca9ff2a46 [formerly cb42eace946af5e6c4a04a8e522489b3f209954f] [formerly 05c00c7bc7 [formerly 96f484e323]]]
Former-commit-id: fdeb5a7e73988a7f1d6b79560d11e18f7a6dc8ac [formerly 9ad6c12354950dd916b1af65b9e0a613b027237b] [formerly 861da21f34 [formerly 7afe6d2df6]]
Former-commit-id: 861da21f34
Former-commit-id: 1eb7f14c99
|
2014-10-06 15:34:30 -05:00 |
|
Steve Harris
|
3f7b7cb843
|
Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 772969f5c8 [formerly 53dc9657e2] [formerly 06a27b2d3c] [formerly 06a27b2d3c [formerly 39c5e9c314]] [formerly 772969f5c8 [formerly 53dc9657e2] [formerly 06a27b2d3c] [formerly 06a27b2d3c [formerly 39c5e9c314]] [formerly 2db03d95b3 [formerly 06a27b2d3c [formerly 39c5e9c314] [formerly 2db03d95b3 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]]]]
Former-commit-id: 2db03d95b3
Former-commit-id: 3a167feb92 [formerly ca63a8cfc3] [formerly bcf1265a16] [formerly 6590c91604916f7b96535d8ffe4438afc15e8f9d [formerly 4363db305e76ae3a50e019f510a7b919ebc7230e] [formerly bcf1265a16 [formerly 3542caf090]]]
Former-commit-id: 02f62561b7e901eb7e411cfc7ab2c4301fea5f2b [formerly 0522d4db8f9331e9bfd83cc7147290634159c673] [formerly afd3d3fa2d [formerly cfd49c8ca0]]
Former-commit-id: afd3d3fa2d
Former-commit-id: cf73096716
|
2014-10-06 13:57:59 -05:00 |
|
Nate Jensen
|
d4aebe2e2b
|
Merge "Omaha #3675 remove -clean option from installed caves" into omaha_14.4.1
Former-commit-id: b7448ba4a9 [formerly 054947764c] [formerly 71efead2db] [formerly 71efead2db [formerly 87d80afd0b]] [formerly b7448ba4a9 [formerly 054947764c] [formerly 71efead2db] [formerly 71efead2db [formerly 87d80afd0b]] [formerly de8b9cf0b8 [formerly 71efead2db [formerly 87d80afd0b] [formerly de8b9cf0b8 [formerly 45140e7bd5ac2dcc51351d74dc87119aeac98f3b]]]]]
Former-commit-id: de8b9cf0b8
Former-commit-id: 0f1fa5c586 [formerly 102a1f5c5b] [formerly bfd4adcf63] [formerly 099f9af7c4b5da04244b28ea977a8035f7269f1a [formerly eae87fcb1695bde68ef1e3bcb6269a6800c5953c] [formerly bfd4adcf63 [formerly e7c6cf60d5]]]
Former-commit-id: fa6698ef0044bd7ec739a55a3f499147dc076e69 [formerly b4e87d05085f2a52fa58791b6b3f2601d490818c] [formerly 47a9b16164 [formerly 12ecb3b68a]]
Former-commit-id: 47a9b16164
Former-commit-id: 50d26f0da8
|
2014-10-06 11:37:54 -05:00 |
|
Nate Jensen
|
62df2a1cff
|
Merge "Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin" into omaha_14.4.1
Former-commit-id: af58665ce9 [formerly 40d5da5e50] [formerly 24bf870977] [formerly 24bf870977 [formerly 28545083c5]] [formerly af58665ce9 [formerly 40d5da5e50] [formerly 24bf870977] [formerly 24bf870977 [formerly 28545083c5]] [formerly 05ae6c5d9b [formerly 24bf870977 [formerly 28545083c5] [formerly 05ae6c5d9b [formerly ded3f476047f92d48891613e4c0b78d20858f1ff]]]]]
Former-commit-id: 05ae6c5d9b
Former-commit-id: a03049d126 [formerly 8011cb24d7] [formerly 7a5bc79ac1] [formerly 5659fb0cfe054169497f5dbd76e2393a02540bcf [formerly 8ba0a6833e307d530471c42099dea3c755f8024f] [formerly 7a5bc79ac1 [formerly 8250390a62]]]
Former-commit-id: d6121737b824128e746c026fddcc1ffdb32ea7ea [formerly cf88e69756e8dabb62bda12c20365e87bf5553be] [formerly 763e75f35b [formerly 53441b1866]]
Former-commit-id: 763e75f35b
Former-commit-id: c91006a7a5
|
2014-10-06 09:08:03 -05:00 |
|
Nate Jensen
|
4509eb0642
|
Merge "Omaha #3675 remove explicitly declaring vm to make alertviz.sh more closely match cave.sh" into omaha_14.4.1
Former-commit-id: 8193591e37 [formerly f35c95de02] [formerly b544abb498] [formerly b544abb498 [formerly baec32be20]] [formerly 8193591e37 [formerly f35c95de02] [formerly b544abb498] [formerly b544abb498 [formerly baec32be20]] [formerly 23c5ea21e4 [formerly b544abb498 [formerly baec32be20] [formerly 23c5ea21e4 [formerly 73be758f4ae461539c4a622cf52b7bc73705fc50]]]]]
Former-commit-id: 23c5ea21e4
Former-commit-id: 7261a0420b [formerly 015c694d2f] [formerly 3941281bb0] [formerly 825b98555a278a7ebc19ee937dd6f3937e025a6c [formerly 7e9e75b3708abb852b52c881df4127de3e856477] [formerly 3941281bb0 [formerly 88afde5dfa]]]
Former-commit-id: 7f6b2bea278840d71d7ebb9276d171beb90ddfea [formerly 43e8eb44fa4a566ec838fb8744a8301569eb65d6] [formerly f623152a9c [formerly fe4e43d8d3]]
Former-commit-id: f623152a9c
Former-commit-id: a7ed20921b
|
2014-10-06 09:07:38 -05:00 |
|
Richard Peter
|
b7735dbd94
|
Omaha #3300 Fix merge of 14.3.1-23
Change-Id: I5cbf187bc5d4ff7c8f0b2f8e33bd8dcc4d0348a9
Former-commit-id: 0c3210576e [formerly 1958d9fe38] [formerly 2422c00fbd] [formerly 2422c00fbd [formerly 5a0dc20480]] [formerly 0c3210576e [formerly 1958d9fe38] [formerly 2422c00fbd] [formerly 2422c00fbd [formerly 5a0dc20480]] [formerly b5f23b8b98 [formerly 2422c00fbd [formerly 5a0dc20480] [formerly b5f23b8b98 [formerly 075f3f69cbf19d298398cb7c481668b97d4dad5d]]]]]
Former-commit-id: b5f23b8b98
Former-commit-id: 2f6d25a9ff [formerly 8b763c729d] [formerly 84a1b71e23] [formerly f15fa3dffba46fb31458c0c907020d937ee59e5e [formerly e2b2cef1529d8894999bfe919bd88ec5029df5c1] [formerly 84a1b71e23 [formerly 4ada2c1c77]]]
Former-commit-id: 46175c1a928b54909b8f705c9b77cdf343ab4901 [formerly 0380f9430066e76c436aeea08918133a896d8893] [formerly f07a0470ee [formerly c6171b84c8]]
Former-commit-id: f07a0470ee
Former-commit-id: 4571a8ab14
|
2014-10-03 14:14:16 -05:00 |
|
Brian.Dyke
|
fe8d528a5a
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: e2f8c513f9 [formerly 5da2026d2b] [formerly 85d83aefe0] [formerly 85d83aefe0 [formerly f440da9c70]] [formerly e2f8c513f9 [formerly 5da2026d2b] [formerly 85d83aefe0] [formerly 85d83aefe0 [formerly f440da9c70]] [formerly 92762f46c7 [formerly 85d83aefe0 [formerly f440da9c70] [formerly 92762f46c7 [formerly 23d16004c389f0ef708bee2a8bfb84d465b7b36b]]]]]
Former-commit-id: 92762f46c7
Former-commit-id: 4c1d3bf326 [formerly beb7a3f448] [formerly 64aef1a783] [formerly 85c579307498fa1c48980fd8a9e2c46d8ba0e589 [formerly 6e5ec5380fe3992e157472559b5e85f288b4b251] [formerly 64aef1a783 [formerly 4dbdf9de26]]]
Former-commit-id: 36f9b099aead747bd87e0fa7bf2d9f481e12e3e2 [formerly d771453098f05cdadd94113c1504ef71db5e8e6b] [formerly 918de34464 [formerly 91f89ee1f6]]
Former-commit-id: 918de34464
Former-commit-id: d8ccd40588
|
2014-10-03 14:04:46 -04:00 |
|
Steve Harris
|
7a740e3f84
|
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: fe9e274e09 [formerly fa1fa76dd9] [formerly f4b771ea72] [formerly f4b771ea72 [formerly da463c484e]] [formerly fe9e274e09 [formerly fa1fa76dd9] [formerly f4b771ea72] [formerly f4b771ea72 [formerly da463c484e]] [formerly 2616fe04b6 [formerly f4b771ea72 [formerly da463c484e] [formerly 2616fe04b6 [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]]]]]
Former-commit-id: 2616fe04b6
Former-commit-id: 641662f39e [formerly 1c1e618183] [formerly 306826aed9] [formerly 40b67d59271cbd32cf7fdbe3aab8ebaa9c8fee28 [formerly 97756f4cc415dba80b72fef671c8609b2b0ef779] [formerly 306826aed9 [formerly 523cedbb56]]]
Former-commit-id: c8c955bbdac9ab07279978c8aa339cb362a09801 [formerly 85a2c5f56cad1fa8121856b8cb5312cdf481051b] [formerly e05d31ae36 [formerly 57f5294f08]]
Former-commit-id: e05d31ae36
Former-commit-id: e40f190f9a
|
2014-10-03 10:18:34 -05:00 |
|
Mark Peters
|
d69b5841af
|
Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin
Change-Id: I1dc26f81d0a6f39b86eb1e832c7204d8b6ce3348
Former-commit-id: 00db666a87 [formerly da72adac03] [formerly ffe3444650] [formerly ffe3444650 [formerly 955f21a85c]] [formerly 00db666a87 [formerly da72adac03] [formerly ffe3444650] [formerly ffe3444650 [formerly 955f21a85c]] [formerly fb62a1e35b [formerly ffe3444650 [formerly 955f21a85c] [formerly fb62a1e35b [formerly 475fa37d70d51e5e9538141730fbead4a6b5d88e]]]]]
Former-commit-id: fb62a1e35b
Former-commit-id: 981a27271c [formerly bb728b015f] [formerly 77da058a9f] [formerly 1345ae00ad039260d2404137b7f1922fb94c7546 [formerly 5748026158d68b3743065ea06e8b17228eeefe25] [formerly 77da058a9f [formerly 6315da5482]]]
Former-commit-id: 6f21b720e7944fd129141eae0dce4c2a23e047e6 [formerly ed0e605da1d6e67998241f168012ead136be8449] [formerly eda9693e85 [formerly f9d5dca0e5]]
Former-commit-id: eda9693e85
Former-commit-id: 71a0ceee2b
|
2014-10-02 15:36:22 -05:00 |
|
Brian.Dyke
|
ef05a4ccb0
|
Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
Former-commit-id: 5d1099354e [formerly 7390f6c3a8] [formerly db665d3876] [formerly db665d3876 [formerly 2a911984f0]] [formerly 5d1099354e [formerly 7390f6c3a8] [formerly db665d3876] [formerly db665d3876 [formerly 2a911984f0]] [formerly 20dd249d2c [formerly db665d3876 [formerly 2a911984f0] [formerly 20dd249d2c [formerly 441fc7561a8526422f9b73b9c47cd220f0babb54]]]]]
Former-commit-id: 20dd249d2c
Former-commit-id: feafb8347b [formerly 8f0310e3be] [formerly 46956a01c6] [formerly 9a475062a9712ea61b95c735635b803affedea29 [formerly b67eecdaf5931ae1d938fb48bd33e3327dd7a473] [formerly 46956a01c6 [formerly 72ea2fbe48]]]
Former-commit-id: 71d68728f488225369a7c206ba2da26c0ce30ab4 [formerly 1353c554161d3298ae22ce357602c081830d7584] [formerly 572bbdd019 [formerly a3ccdd9704]]
Former-commit-id: 572bbdd019
Former-commit-id: 9308ab8537
|
2014-10-02 10:44:50 -04:00 |
|
Brian.Dyke
|
374b669bfc
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: ff12e5c05c [formerly 06f6dfc38a] [formerly 006bdb00ad] [formerly 006bdb00ad [formerly 65ad6056b6]] [formerly ff12e5c05c [formerly 06f6dfc38a] [formerly 006bdb00ad] [formerly 006bdb00ad [formerly 65ad6056b6]] [formerly f3f95aabb0 [formerly 006bdb00ad [formerly 65ad6056b6] [formerly f3f95aabb0 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]]]]]
Former-commit-id: f3f95aabb0
Former-commit-id: 787dd72934 [formerly 452a3f046b] [formerly d174db3b0c] [formerly 8078d005ea853597b3b19b8c5cd6c287e6b87bbf [formerly c24910662181554debcd898acc9cf5ec28027cf0] [formerly d174db3b0c [formerly e77f1e126e]]]
Former-commit-id: 4e6e8024c2b58243a90fd754468adccfd3cdfb78 [formerly 2c9750edd9ade43fd7db7e61b4503a53d6f26781] [formerly e100894074 [formerly 1d2dfd264a]]
Former-commit-id: e100894074
Former-commit-id: 2b3ced91f5
|
2014-10-02 10:38:51 -04:00 |
|
Brian.Dyke
|
ac98bb8b4d
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 4a0c55af61 [formerly d1c62c3542] [formerly d4888adc0f] [formerly d4888adc0f [formerly f47840e4d9]] [formerly 4a0c55af61 [formerly d1c62c3542] [formerly d4888adc0f] [formerly d4888adc0f [formerly f47840e4d9]] [formerly 2ac30f6c22 [formerly d4888adc0f [formerly f47840e4d9] [formerly 2ac30f6c22 [formerly ece734cb6218a80fa2dda1b3c43673dc5a31bfbb]]]]]
Former-commit-id: 2ac30f6c22
Former-commit-id: 4412662f2a [formerly 75ac4f1971] [formerly 277b6e4b36] [formerly ff699b341f995a1370ee932f03f7ce6e4a414b48 [formerly 93329339083b58eea30cf9a2fd0c9efc1645f3bb] [formerly 277b6e4b36 [formerly 36d377e08d]]]
Former-commit-id: dadc0b1263786bb3456a6f56f51f52538b1414b8 [formerly 99779fb5c1561694dd3f154813fbc624081344ca] [formerly c853463f73 [formerly 7e465baead]]
Former-commit-id: c853463f73
Former-commit-id: 18c69d87e2
|
2014-10-02 10:24:04 -04:00 |
|
Brian.Dyke
|
bdb9031c25
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 0ed9e51a0e [formerly 65ff0876ac] [formerly 31f073ee3a] [formerly 31f073ee3a [formerly 4bc465bfbd]] [formerly 0ed9e51a0e [formerly 65ff0876ac] [formerly 31f073ee3a] [formerly 31f073ee3a [formerly 4bc465bfbd]] [formerly 97464ea153 [formerly 31f073ee3a [formerly 4bc465bfbd] [formerly 97464ea153 [formerly f26e54011d334972bb1e999304b1b2d13a1c408f]]]]]
Former-commit-id: 97464ea153
Former-commit-id: 3fc838a92a [formerly 6fb0b9db12] [formerly 0915cb28b0] [formerly 293de34b9b26bcb3f1011867a2bd7ec81688c82f [formerly e6df31f2ffcf43d1eb4e7ab7f3e4535088a2930f] [formerly 0915cb28b0 [formerly e76ee74410]]]
Former-commit-id: 37802e3a87c41fffed9aedfa5035b0ba55b1232d [formerly 565e90f88a51d32a3dc74eded19ae3d9afe627ab] [formerly 0fa5e7da1a [formerly 1d5c3fb6d4]]
Former-commit-id: ff23cfcb2a28781cea139b25aeeb7690416bfcfd [formerly 0fa5e7da1a]
Former-commit-id: 06b277ddad
|
2014-10-02 10:15:34 -04:00 |
|
Nate Jensen
|
c72742451b
|
Omaha #3675 remove explicitly declaring vm to make alertviz.sh more
closely match cave.sh
Change-Id: I930fea4d71c4cf6ec990e059469ed59af69b9662
Former-commit-id: b3dcc55a80 [formerly 0aebb15a38] [formerly 9f74ca65bc] [formerly 9f74ca65bc [formerly e964375fcc]] [formerly b3dcc55a80 [formerly 0aebb15a38] [formerly 9f74ca65bc] [formerly 9f74ca65bc [formerly e964375fcc]] [formerly 33e3281d55 [formerly 9f74ca65bc [formerly e964375fcc] [formerly 33e3281d55 [formerly 690868294ab74d5c3b73c12f81534d685bb652aa]]]]]
Former-commit-id: 33e3281d55
Former-commit-id: d2eaf7e4a8 [formerly 54d382fa7c] [formerly 23ebf782f3] [formerly bab1ce1e2d910a14d95ff8e68520a4a07c6a1a02 [formerly 021f3802d2585856e5af0f032cd3a2f6494ac93f] [formerly 23ebf782f3 [formerly 6670e31705]]]
Former-commit-id: 9171cba4efef6184beabcad248d005041030fb9e [formerly 8a5f64af32a17d5ab4c7881b654de0d811d9f419] [formerly e156cf3b33 [formerly b0e0632c7a]]
Former-commit-id: e156cf3b33
Former-commit-id: efd471e4a9
|
2014-10-02 08:49:32 -05:00 |
|