Commit graph

6716 commits

Author SHA1 Message Date
Mark Peters
eaf4ad4ffc Omaha #3582 Clean up SerializationUtil's JAXB/XML support
Change-Id: Ic334e43ff0ddb2556f79b04e32a3daeed478f431

Former-commit-id: 5abd331ae3 [formerly 63f44c571d] [formerly 5abd331ae3 [formerly 63f44c571d] [formerly b34220fca5 [formerly fcb1a5c9c93ffe19f9a4e3706f68fab12a0649dc]]]
Former-commit-id: b34220fca5
Former-commit-id: 70c41915ae [formerly 3f251f55bf]
Former-commit-id: a9a6b39f29
2014-09-12 11:46:40 -05:00
Nate Jensen
c915f2b618 Omaha #3356 ensure LevelFactory is initialized on edex before GFE startup
Change-Id: I889b85404fc361dc92ae4323fb20ab44ff12a166

Former-commit-id: 85119e5610 [formerly 0bde7e01fb] [formerly 85119e5610 [formerly 0bde7e01fb] [formerly cbe3d885a2 [formerly 64f5c249ed837f854db743e1b90f2194c01cdbfd]]]
Former-commit-id: cbe3d885a2
Former-commit-id: c377150a59 [formerly 64140e614a]
Former-commit-id: a214a90337
2014-09-12 09:14:01 -05:00
Brian Clements
f3d1bf85b4 Omaha #3608 improved error handling in lightning frame retriever
Change-Id: I02784a7f2d23bf37d56294e55cb9ec759d1f9080

Former-commit-id: ce24dad434 [formerly b9dd6d798b] [formerly ce24dad434 [formerly b9dd6d798b] [formerly c56645dd01 [formerly 0551b91b995c893fddee52cabdfbdccf83121a31]]]
Former-commit-id: c56645dd01
Former-commit-id: 6a333bde00 [formerly 07b48207a2]
Former-commit-id: b4b45c0152
2014-09-11 11:52:23 -05:00
Richard Peter
202279442f Merge "Omaha #3615 Register 2D metar fields" into omaha_14.4.1
Former-commit-id: 8f912115ac [formerly dbd3cd85d6] [formerly 8f912115ac [formerly dbd3cd85d6] [formerly dad8f4c869 [formerly bb317434e32d73c2f1caa2bc335a117be17a2d07]]]
Former-commit-id: dad8f4c869
Former-commit-id: c0cc0e6f02 [formerly 01287e329e]
Former-commit-id: ceb8ed381f
2014-09-11 11:20:43 -05:00
Nate Jensen
7b1bff973f Merge "Omaha #3548 PluginDataObjectFilter fails to start in spring" into omaha_14.4.1
Former-commit-id: 7a57781b2a [formerly 7d664adaf2] [formerly 7a57781b2a [formerly 7d664adaf2] [formerly af1052ccf6 [formerly b70bcdf470e20eed85352e14939f13cbeb91b49b]]]
Former-commit-id: af1052ccf6
Former-commit-id: 9dac021eec [formerly 2d9130b0f4]
Former-commit-id: aeafce9318
2014-09-11 11:11:30 -05:00
Mark Peters
09003ad30b Omaha #3548 PluginDataObjectFilter fails to start in spring
Change-Id: I6db18d15b5a35a081de48a885e3d27495b44b5d0

Former-commit-id: cbb5715b34 [formerly d671d1f432] [formerly cbb5715b34 [formerly d671d1f432] [formerly fb33786001 [formerly e9d50c287b6327ea03437a98fb1077b904daeecd]]]
Former-commit-id: fb33786001
Former-commit-id: 53cf3a043b [formerly a18f767151]
Former-commit-id: 8be9ecd84a
2014-09-11 10:32:11 -05:00
Nathan Bowler
0f4e9d3945 Omaha #3615 Register 2D metar fields
Change-Id: Ic6cfcbfd1fcbab921732366c8803d54ea493845a

Former-commit-id: 7ae1ebfd24 [formerly ede0cbf395] [formerly 7ae1ebfd24 [formerly ede0cbf395] [formerly ab09b948a6 [formerly 3101fdbde5e8023fdc33ff18ad25c9a8c830693a]]]
Former-commit-id: ab09b948a6
Former-commit-id: ccc72c49cb [formerly f8b6324531]
Former-commit-id: 9a1f5ec8d0
2014-09-11 11:20:40 -04:00
Max Schenkelberg
a2e7d1324f Omaha #3612 Refactored AbstractCAVEComponent to extend CAVEApplication
Change-Id: Iccaa6d95ec47fa41080929e456ff450eb61f41eb

Former-commit-id: 422ceffbdd [formerly 3ea9b1b4be] [formerly 422ceffbdd [formerly 3ea9b1b4be] [formerly 994605c1ce [formerly 154c4ac7131ae8f533d4080055d9afe257bf0506]]]
Former-commit-id: 994605c1ce
Former-commit-id: 165583b144 [formerly 3b1a3f84fd]
Former-commit-id: 144e042b42
2014-09-10 15:43:19 -05:00
Richard Peter
e9740b73fe Merge "Omaha #3356 updates for improved level lookup" into omaha_14.4.1
Former-commit-id: bec987b601 [formerly 49949b99c5] [formerly bec987b601 [formerly 49949b99c5] [formerly 0608175d2d [formerly 74f89af8dda533b6b905c86be1afac3e2633923b]]]
Former-commit-id: 0608175d2d
Former-commit-id: 414b255b80 [formerly aed4031560]
Former-commit-id: e0221d1b10
2014-09-10 14:32:32 -05:00
Mark Peters
3c730ef05f Omaha #3548 PluginDataObjectFilter fails to start in spring
Change-Id: Ia69c93c5bab1c730c3c4bad6781823f989bc1641

Former-commit-id: 203e21b807 [formerly 685a9b1960] [formerly 203e21b807 [formerly 685a9b1960] [formerly 735cafee83 [formerly 4d059172e0d822a2fb740d602265da6a91e15ccc]]]
Former-commit-id: 735cafee83
Former-commit-id: 5ca19d6ab8 [formerly 6684a32468]
Former-commit-id: 9ce57d5780
2014-09-09 16:09:04 -05:00
Nate Jensen
3cf27fb414 Omaha #3356 updates for improved level lookup
Change-Id: I32ca44114fb18770bff22c6d0c9173e8fa49a362

Former-commit-id: 1c77f66608 [formerly ae9cffaaea] [formerly 1c77f66608 [formerly ae9cffaaea] [formerly 62b84b2fb3 [formerly 0ca90b58d7ca85d5bfc8fc525415115ac8451c5b]]]
Former-commit-id: 62b84b2fb3
Former-commit-id: d397d4147c [formerly f5ae895143]
Former-commit-id: eec3df9cd5
2014-09-09 15:38:53 -05:00
Nate Jensen
a623f53f1d Merge "Omaha #3356 more removal of unnecessary register buddies" into omaha_14.4.1
Former-commit-id: 644c0acbfe [formerly 986a03c7c5] [formerly 644c0acbfe [formerly 986a03c7c5] [formerly 7920053e2f [formerly 90e8451dd089de67278368ca665da0cfc5bb6740]]]
Former-commit-id: 7920053e2f
Former-commit-id: 393c49b691 [formerly bd9b4a9355]
Former-commit-id: 3d70613ca0
2014-09-09 09:23:28 -05:00
Brian Clements
d6baeddbb1 Omaha #3570 http client API changes
Change-Id: Icb6dc44e7841961da3df383e879acf4ef8f1a14f

Former-commit-id: 06e4c1e644 [formerly 8489ce1214] [formerly 06e4c1e644 [formerly 8489ce1214] [formerly 21ded3ea69 [formerly d4edd51d41a306010a7fec2a7ed2c0cd6186506a]]]
Former-commit-id: 21ded3ea69
Former-commit-id: 84634e9987 [formerly 1186014784]
Former-commit-id: e9efd4e501
2014-09-09 08:47:32 -05:00
Nate Jensen
642f11aec0 Omaha #3356 more removal of unnecessary register buddies
Change-Id: Ic91c2d5ab93bb220a69be23c54640edae26302a3

Former-commit-id: 606642b99f [formerly 26e2ff44a4] [formerly 606642b99f [formerly 26e2ff44a4] [formerly b46f23d01b [formerly 39bfb8fd0548c74ed9a4e95b914e90ab2f6ad526]]]
Former-commit-id: b46f23d01b
Former-commit-id: 84b0e0117f [formerly 9dafcc915c]
Former-commit-id: 76a397f500
2014-09-08 17:18:22 -05:00
Richard Peter
5f9947a20c Merge "Omaha #3405 Convert airep and pirep to DAF. Extract common code. Update acars to use common" into omaha_14.4.1
Former-commit-id: d1b3a98c92 [formerly 40a1936b20] [formerly d1b3a98c92 [formerly 40a1936b20] [formerly b68ffa6f09 [formerly 9b96e7075b95fb68cda21d03571e56bf4ec53a2e]]]
Former-commit-id: b68ffa6f09
Former-commit-id: f6ec37f765 [formerly eafce0bd5a]
Former-commit-id: c5da67694d
2014-09-08 16:33:40 -05:00
Nate Jensen
1705ca5735 Merge "Omaha #2926 switched text subscription to thrift client" into omaha_14.4.1
Former-commit-id: 4398f2d7d8 [formerly da3e7dbf72] [formerly 4398f2d7d8 [formerly da3e7dbf72] [formerly 88e11a4909 [formerly 51c60cf39cc950771597ff652c0e683c73812d91]]]
Former-commit-id: 88e11a4909
Former-commit-id: e212fd841f [formerly 9083d4956b]
Former-commit-id: 800ffc4ef9
2014-09-08 13:58:02 -05:00
Brian Clements
cb37ddfd9d Omaha #3518 each JVM gets a unique user prefs folder
Change-Id: I3ea2cf98836bb3a5447b307eda4a5ab235b18619

Former-commit-id: e95a139900 [formerly 2c1cd559b6] [formerly e95a139900 [formerly 2c1cd559b6] [formerly a0d663530b [formerly 856b223352b99e3f96df6dab84aea313885b3c37]]]
Former-commit-id: a0d663530b
Former-commit-id: 7938c547e8 [formerly b3d6dbad76]
Former-commit-id: 7397b4c453
2014-09-08 13:16:13 -05:00
Nathan Bowler
ff66970808 Omaha #3405 Convert airep and pirep to DAF. Extract common code. Update acars to use common
Change-Id: I09fd0119900dabbde901773469d90b31eda57d63

Former-commit-id: ebe27b736f [formerly ee5d7fc5e5] [formerly ebe27b736f [formerly ee5d7fc5e5] [formerly 099f40fb87 [formerly 4c32ce907e8bad06015688ca5596a23bfb655463]]]
Former-commit-id: 099f40fb87
Former-commit-id: bcfdc408d4 [formerly ac6f4dea5a]
Former-commit-id: 7af3b8b174
2014-09-08 12:36:48 -04:00
Brian Clements
f4fa010292 Omaha #2926 switched text subscription to thrift client
Change-Id: I3fafee2252aff2a80657cdf8a8092f63459671c6

Former-commit-id: d8b2da2900 [formerly ac811b666c] [formerly d8b2da2900 [formerly ac811b666c] [formerly 0087580736 [formerly 410ef2954d6cfff11a4718056983ccaecf186fd3]]]
Former-commit-id: 0087580736
Former-commit-id: d7a388cfd9 [formerly 375c3a6f78]
Former-commit-id: 11974d9809
2014-09-05 16:52:38 -05:00
Brian Clements
a5e8e94411 Omaha #2926 moved TextDBRequest to common
Change-Id: I8f18b6e24d1c27feb5713d4c4f80341fd5d0b67c

Former-commit-id: c89a74943e [formerly 1b248efb54] [formerly c89a74943e [formerly 1b248efb54] [formerly c77b4f4e8b [formerly 924e512c327c838d866b353ec8da8f7e5534db49]]]
Former-commit-id: c77b4f4e8b
Former-commit-id: 8cc7d1e36d [formerly 3a0da3d8d5]
Former-commit-id: 4640945dc7
2014-09-05 12:56:04 -05:00
Chris Cody
97d6b67891 Omaha #3365 Removing and realigning AWIPS2 Baseline tests
Change-Id: Iba40d0b074df500c52b7302ab59a688680153f48

Former-commit-id: 39887a4b9c [formerly f4445d24cd] [formerly 39887a4b9c [formerly f4445d24cd] [formerly 9e823a47d6 [formerly 97000cc70e8d826b3e8828a1731278673e0ac635]]]
Former-commit-id: 9e823a47d6
Former-commit-id: 62780e001b [formerly 57c689eee6]
Former-commit-id: 0564fa8bf9
2014-09-05 10:14:14 -05:00
Nate Jensen
064d75be69 Merge "Omaha #3467 Error occurs when loading/editing the Range Rings tool multiple times" into omaha_14.4.1
Former-commit-id: 2f0554097a [formerly 51d910af00] [formerly 2f0554097a [formerly 51d910af00] [formerly cf41d7e3a3 [formerly 03fc1d04092135970a6c7089bcbbf11d5c584dd1]]]
Former-commit-id: cf41d7e3a3
Former-commit-id: 3ae925ce87 [formerly 96b3c08bd1]
Former-commit-id: 165b5fd49b
2014-09-04 13:49:36 -05:00
Nate Jensen
e89d0a9aad Merge "Omaha #3356 remove unnecessary register buddy to uf.viz.core" into omaha_14.4.1
Former-commit-id: f8d2bbd89a [formerly c17f5039b3] [formerly f8d2bbd89a [formerly c17f5039b3] [formerly 6c89507d2f [formerly ae78c2f59d47eb83d8693676362aaf099dbbe35b]]]
Former-commit-id: 6c89507d2f
Former-commit-id: 667bda47a8 [formerly 8277e2cd1f]
Former-commit-id: 65d06e808e
2014-09-04 13:48:39 -05:00
Nate Jensen
8d779e79d3 Merge "Omaha #3545 - Add log and fail message when directories are missing" into omaha_14.4.1
Former-commit-id: 755dd0c97e [formerly 7a5eeb427c] [formerly 755dd0c97e [formerly 7a5eeb427c] [formerly 1cd7ec9ac7 [formerly 40448419702642f0e7b85dbe031b091e43e9ee88]]]
Former-commit-id: 1cd7ec9ac7
Former-commit-id: d4359bb64a [formerly 326185ad9c]
Former-commit-id: cdb4604072
2014-09-04 13:24:29 -05:00
Greg Armendariz
98c50cb61e Omaha #3545 - Add log and fail message when directories are missing
Former-commit-id: e8a75882ee [formerly 0a988d64e4] [formerly e8a75882ee [formerly 0a988d64e4] [formerly a5359e4547 [formerly 05d45b0c005ce7c8cca51c367754e7e6bca6c085]]]
Former-commit-id: a5359e4547
Former-commit-id: b7535cb9ac [formerly e658278545]
Former-commit-id: 08b5040650
2014-09-04 11:52:13 -05:00
Nathan Bowler
6d5bf0a035 Omaha #3405 Adding unaltered, original airep and pirep scripts
Change-Id: I9daefa1c0c905b2022d7ad891a9983fb831c5ac3

Former-commit-id: d7d3a3d119 [formerly 0a6cd0db2d] [formerly d7d3a3d119 [formerly 0a6cd0db2d] [formerly b1b0760a8c [formerly 4a47a2053311ebc5ae4a5ad540c985c7a24ea4f3]]]
Former-commit-id: b1b0760a8c
Former-commit-id: 3e7a32b146 [formerly 8684ea7447]
Former-commit-id: 3e0ea8f7ff
2014-09-04 12:27:40 -04:00
Nate Jensen
6140da7ee6 Merge "Omaha #3170 add data times to ffmp geometries being returned, also aggregate data as it is more useful that way" into omaha_14.4.1
Former-commit-id: d977dbfcb0 [formerly 1fd0ed2de6] [formerly d977dbfcb0 [formerly 1fd0ed2de6] [formerly 3a2558eac8 [formerly fbc9b64a0c0734e46ec9db10e0760aa8f2b27c24]]]
Former-commit-id: 3a2558eac8
Former-commit-id: 2781d227f3 [formerly bb8918e96b]
Former-commit-id: 577e3341f6
2014-09-03 17:13:06 -05:00
Nate Jensen
364295639c Omaha #3356 remove unnecessary register buddy to uf.viz.core
Change-Id: I95915b6f1d458a5bb581eec79d40af8bc94122f4

Former-commit-id: 0967e25c67 [formerly 20251fc3e3] [formerly 0967e25c67 [formerly 20251fc3e3] [formerly b332434b49 [formerly a46d5914ae58ad1c3410cdf8d7e67cf856e4c2bd]]]
Former-commit-id: b332434b49
Former-commit-id: ccb7d4a797 [formerly 6285cc9893]
Former-commit-id: 9e1336de40
2014-09-03 16:10:53 -05:00
Matt Nash
667ce84a62 Omaha #3170 add data times to ffmp geometries being returned, also aggregate data as it is more useful that way
Former-commit-id: 90b0619656 [formerly 118d811eee] [formerly 90b0619656 [formerly 118d811eee] [formerly 980d7bf5ad [formerly dd691896f03ba16d683a284a26b8ef923e364834]]]
Former-commit-id: 980d7bf5ad
Former-commit-id: 23d1a555a7 [formerly bce9e0595c]
Former-commit-id: a1ea03c29b
2014-09-03 14:11:15 -05:00
Nate Jensen
3188cd0af2 Omaha #3356 remove more unnecessary register buddies and policies
Change-Id: I3e39f9b8274b2b9104f3b3d037601c1553c43e13

Former-commit-id: 2c74d90cc4 [formerly c0dab26b92] [formerly 2c74d90cc4 [formerly c0dab26b92] [formerly 9d462e1dd9 [formerly b535d54c52c3e38bb9fa083ba911ad49c090f214]]]
Former-commit-id: 9d462e1dd9
Former-commit-id: d5e948b7e2 [formerly 05a73b1e4b]
Former-commit-id: d87cfb8131
2014-09-03 11:34:10 -05:00
Nate Jensen
64c23a487d Omaha #3356 remove unnecessary dependency
Change-Id: I59503f01e8c7ec451c7dcb725bf9fecd0209fba2

Former-commit-id: a7984f6dde [formerly 4b5d5ab6cc] [formerly a7984f6dde [formerly 4b5d5ab6cc] [formerly 362fee1984 [formerly c60ca3a16e348216c582f30bc95d8d35ef81e312]]]
Former-commit-id: 362fee1984
Former-commit-id: 9e5c92de45 [formerly de4472f76b]
Former-commit-id: 5a2a700085
2014-09-03 10:53:30 -05:00
Nate Jensen
4d031466de Merge "Omaha #3356 remove OBE register buddies from collaboration" into omaha_14.4.1
Former-commit-id: 8bb8625edf [formerly 2a097da5c2] [formerly 8bb8625edf [formerly 2a097da5c2] [formerly 0de385006d [formerly 91942c044f4c4462a2a76192047c40448754c2ec]]]
Former-commit-id: 0de385006d
Former-commit-id: acb9909b35 [formerly c6a5a6145e]
Former-commit-id: f1d071ad10
2014-09-03 10:50:02 -05:00
Nate Jensen
22fa9cc6d9 Omaha #3356 remove OBE register buddies from collaboration
Change-Id: I49099386a48b650c9e6ea1a96b519fbc178f769f

Former-commit-id: b690c360ac [formerly 8e74892cd6] [formerly b690c360ac [formerly 8e74892cd6] [formerly 40d4abe4cd [formerly 89de611bd1abdd016ae8a96db4c820004c52b406]]]
Former-commit-id: 40d4abe4cd
Former-commit-id: f78e7fe79c [formerly 5b2e410c6c]
Former-commit-id: 54e9b04c3d
2014-09-03 10:00:11 -05:00
Chris Cody
cfc713d6ea Omaha #3365 Separate Data Delivery tests out of AWIPS 2 baseline
Conflicts:
	tests/unit/com/raytheon/uf/common/serialization/comm/RequestRouterTest.java
	tests/unit/com/raytheon/uf/edex/requestsrv/request/ServerPrivilegedRequestHandlerTest.java
	tests/unit/com/raytheon/uf/edex/requestsrv/router/RemoteServerRequestRouterTest.java
	tests/unit/com/raytheon/uf/edex/requestsrv/router/ServerRequestRouterTest.java

Change-Id: Ib1cec696e6c31b4a3292174a3557fe72b86ce4ff

Former-commit-id: 13bc309688 [formerly 005c0c0b10] [formerly 13bc309688 [formerly 005c0c0b10] [formerly 7dfcf245bf [formerly 5161931ed5438b78a936f204a588a742c9768f8a]]]
Former-commit-id: 7dfcf245bf
Former-commit-id: 58b663b788 [formerly 41c12afc1d]
Former-commit-id: 7cb8e16a5e
2014-09-03 09:54:46 -05:00
Chris Cody
c2ff252400 Omaha #3365 Separate Data Delivery tests out of AWIPS 2 baseline.
Conflicts:
	tests/.classpath

Change-Id: I0014762b034e95b1bb8a6d37a18ef7445873994c

Former-commit-id: 91fde6ab60 [formerly f8faec0526] [formerly 91fde6ab60 [formerly f8faec0526] [formerly 529377618f [formerly 07aa4794d04cb31e7c6020d792d45d0afb951268]]]
Former-commit-id: 529377618f
Former-commit-id: 8e340e4b05 [formerly 3fc1103d07]
Former-commit-id: f025c02ec6
2014-09-03 09:50:50 -05:00
Nate Jensen
8248f2f5ab Merge "Omaha #3548 PluginDataObjectFilter fails to start in spring" into omaha_14.4.1
Former-commit-id: a0830d06d5 [formerly 5b80aadbac] [formerly a0830d06d5 [formerly 5b80aadbac] [formerly 80cc58cf25 [formerly e393e1f0455d466edde925608b6f0f1e35351141]]]
Former-commit-id: 80cc58cf25
Former-commit-id: 8e6f1c0b05 [formerly db8517a576]
Former-commit-id: d717f13039
2014-09-03 09:21:28 -05:00
Mark Peters
72184dbcaf Omaha #3467 Error occurs when loading/editing the Range Rings tool multiple times
Change-Id: I68642e05ce970545a516d4fab1492a860c530032

Former-commit-id: 447986eed3 [formerly 06b98bb48a] [formerly 447986eed3 [formerly 06b98bb48a] [formerly ee36d09cb0 [formerly 725354074d54112c8658dc34a8ac564739acbebb]]]
Former-commit-id: ee36d09cb0
Former-commit-id: 8ace5b852c [formerly a3feb0de78]
Former-commit-id: e7e58b4e78
2014-09-02 16:31:44 -05:00
Ben Steffensmeier
5b35e526f4 Omaha #3390 Remove references to deprecated API.
Former-commit-id: 950075dc59 [formerly 1d2144e840] [formerly 950075dc59 [formerly 1d2144e840] [formerly e32037b42a [formerly ec7eeeb08af2cbad5d7880ae17ba7b351de23dc3]]]
Former-commit-id: e32037b42a
Former-commit-id: 068653ac95 [formerly b77166c26e]
Former-commit-id: 6e1981d6f6
2014-09-02 15:39:45 -05:00
Richard Peter
d9acda4485 Merge "Omaha #3549 improve error message" into omaha_14.4.1
Former-commit-id: d968b5085d [formerly 3c874e1aa1] [formerly d968b5085d [formerly 3c874e1aa1] [formerly 7dc4327ffa [formerly 6e8ad4c9e2046ac950bbf166a09492a69c88cb7e]]]
Former-commit-id: 7dc4327ffa
Former-commit-id: b9db837e14 [formerly 388c1ca919]
Former-commit-id: 6bee61c16f
2014-09-02 14:25:18 -05:00
Richard Peter
bb5b769b96 Merge "Omaha #2926 switched textdb to thrift client" into omaha_14.4.1
Former-commit-id: 612990b3ed [formerly 7628a0a56a] [formerly 612990b3ed [formerly 7628a0a56a] [formerly 0f94b663a4 [formerly 80294bbd891edde5b190941175f73d634f1a3e08]]]
Former-commit-id: 0f94b663a4
Former-commit-id: e3e9368411 [formerly 6151d549ce]
Former-commit-id: eca48d7b90
2014-09-02 12:45:37 -05:00
Nate Jensen
78b9181a68 Omaha #3549 improve error message
Change-Id: I54cdefd3b77fa5ad8eba9aad6ae8c93b7bd0a67d

Former-commit-id: 3cf81ab39e [formerly fa330b698d] [formerly 3cf81ab39e [formerly fa330b698d] [formerly 37501b884a [formerly 369867e18b5209895137f5e4121fa06bfa2858c7]]]
Former-commit-id: 37501b884a
Former-commit-id: 635604b7a9 [formerly 11b4f270e6]
Former-commit-id: 7336cbb500
2014-09-02 12:38:04 -05:00
Richard Peter
76be4ae710 Merge "Omaha #3549 improve acarssounding error message" into omaha_14.4.1
Former-commit-id: 78550587d8 [formerly 1ebcacee88] [formerly 78550587d8 [formerly 1ebcacee88] [formerly 09a044b9af [formerly 4d0cb95dfed73beeb51e15d753b76c315877d2ea]]]
Former-commit-id: 09a044b9af
Former-commit-id: e9114850ac [formerly 7fa3a9b834]
Former-commit-id: 33b9f58bc3
2014-09-02 12:32:39 -05:00
Ron Anderson
c13e748b6c Merge "Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective" into omaha_14.4.1
Former-commit-id: 8d9741bd83 [formerly 6a5d4acf7c] [formerly 8d9741bd83 [formerly 6a5d4acf7c] [formerly aa6835147b [formerly 31578a50044053da2ecf14697764bfac2ee8ac8d]]]
Former-commit-id: aa6835147b
Former-commit-id: f27986f541 [formerly 017378f646]
Former-commit-id: 8ab30a7e02
2014-09-02 12:08:44 -05:00
Mark Peters
3a8e2b71fd Omaha #3548 PluginDataObjectFilter fails to start in spring
Change-Id: Ib0aa88dd3341ae65aef9b2b02ffbd1645510b95e

Former-commit-id: be6dae0cf9 [formerly ad994bc4c6] [formerly be6dae0cf9 [formerly ad994bc4c6] [formerly 53869a4b0b [formerly 07b54b870e36f37b909d9e7da1f1da4d181b06b0]]]
Former-commit-id: 53869a4b0b
Former-commit-id: 6ddbbc366a [formerly 2c02132ec0]
Former-commit-id: ae87858e3d
2014-09-02 11:38:06 -05:00
Nate Jensen
0189b9da69 Omaha #3549 improve acarssounding error message
Change-Id: I850eb6bbcd825bee26f0e93226b10d077378dacf

Former-commit-id: 6838a4d8cc [formerly 8570cad6c6] [formerly 6838a4d8cc [formerly 8570cad6c6] [formerly 82ef4c1646 [formerly 16e66726bd5a8f20d6de21708c7f3372a046cea8]]]
Former-commit-id: 82ef4c1646
Former-commit-id: c7fdb67228 [formerly eed90eceeb]
Former-commit-id: fddcabac0a
2014-09-02 11:21:10 -05:00
Greg Armendariz
8566996f06 Merge "Omaha #3573 fixed clean in collaboration dataserver ant script" into omaha_14.4.1
Former-commit-id: a9f6d3528c [formerly 33b0ac3811] [formerly a9f6d3528c [formerly 33b0ac3811] [formerly b229adbf38 [formerly 2a4e26c1be0118f71e18a2c5bfa8777163a97d30]]]
Former-commit-id: b229adbf38
Former-commit-id: d63a9da4d6 [formerly edb50956c8]
Former-commit-id: a2aa3fa6ff
2014-09-02 10:40:13 -05:00
Nate Jensen
0c55719688 Merge "Omaha #3356 fix cave startup" into omaha_14.4.1
Former-commit-id: 3258b9a2b2 [formerly 5247f4833f] [formerly 3258b9a2b2 [formerly 5247f4833f] [formerly 653d594382 [formerly e3c3d979ba7dcb46d2af716aa73e05c67f0dd2ba]]]
Former-commit-id: 653d594382
Former-commit-id: 9067556a0e [formerly a63f5ee67b]
Former-commit-id: 8078915092
2014-09-02 10:14:08 -05:00
Brian Clements
54a627e05a Omaha #3573 fixed clean in collaboration dataserver ant script
Change-Id: I52d58a2c17b4f667cc2341a7e52380877aa6f74a

Former-commit-id: eb84b255b0 [formerly 9fe49043e7] [formerly eb84b255b0 [formerly 9fe49043e7] [formerly 23f1f7b2b6 [formerly d2bfe367c9753fc4a2db181c7966179a20713a02]]]
Former-commit-id: 23f1f7b2b6
Former-commit-id: 8da4a4ccf4 [formerly 7a29eef035]
Former-commit-id: e56c909c26
2014-09-02 10:04:39 -05:00
Nate Jensen
070ef331b9 Merge "Omaha #3569 Split Volume Browser planes menus into multiple reusable components." into omaha_14.4.1
Former-commit-id: e673ed62bd [formerly 2c209af1fa] [formerly e673ed62bd [formerly 2c209af1fa] [formerly fe457e89a7 [formerly 09d7406f13949cf6a90164b06742c80ba2e18110]]]
Former-commit-id: fe457e89a7
Former-commit-id: 675bf92355 [formerly 5661124038]
Former-commit-id: 84a107c8fa
2014-09-02 09:53:25 -05:00
Nate Jensen
037859fb38 Merge "Omaha #3459 Ensure font is initialized before queryJob runs, Additional refactoring to someday allow ZoneSelectorResource to use more common code." into omaha_14.4.1
Former-commit-id: 3efe4cf3b0 [formerly c4333e030c] [formerly 3efe4cf3b0 [formerly c4333e030c] [formerly 13f1a5a8ab [formerly 172d733902e6430de4f776eed3ad4cd6a94164a5]]]
Former-commit-id: 13f1a5a8ab
Former-commit-id: ce408af16d [formerly d7a2ff8336]
Former-commit-id: f913771eb0
2014-09-02 09:52:38 -05:00