Commit graph

2484 commits

Author SHA1 Message Date
Richard Peter
d2ea67a70c Merge "Issue #2627 harden static initialization on edex main thread" into development
Former-commit-id: 2be140c0c4 [formerly fdba3b3099] [formerly 7c02ab6b66] [formerly 2be140c0c4 [formerly fdba3b3099] [formerly 7c02ab6b66] [formerly 6b08aaf55c [formerly 7c02ab6b66 [formerly 82f20a96a82ef7f047f716662d319e522ee1c394]]]]
Former-commit-id: 6b08aaf55c
Former-commit-id: e188d13ce1 [formerly f6e1fc89de] [formerly 492f316506c2780dd12c817c21369a49396beff4 [formerly c12b4fb4ea]]
Former-commit-id: ffc90d2575b5eeaef42424f40f4ce80a4ba342d3 [formerly 0041d4c2d3]
Former-commit-id: ec31c46b9a
2014-03-04 17:54:09 -06:00
Nate Jensen
0921c69a23 Issue #2627 harden static initialization on edex main thread
Change-Id: Icff0a2fd60bec882ac96fc218deb88b16eaeaaff

Former-commit-id: e458ca5c52 [formerly 99254281af] [formerly b989b7240c] [formerly e458ca5c52 [formerly 99254281af] [formerly b989b7240c] [formerly 660998ac72 [formerly b989b7240c [formerly bb838950a2979703ae6ab8f486fc4460789c3f1b]]]]
Former-commit-id: 660998ac72
Former-commit-id: 0122afaf40 [formerly fadd59b36d] [formerly 7ec8c1c2768c7da3e60681607289e7157433c1ad [formerly 81a6675a14]]
Former-commit-id: 6ca0b4dc5d4a2ba4cf3297580f8c2ad1e3c884a9 [formerly 6df4547b41]
Former-commit-id: 682291237e
2014-03-04 17:19:24 -06:00
Brian Clements
3aaee14c5f Issue #2756 added security toggle to collaboration
security on HTTP server can be disabled for legacy clients from openfire settings
added xmpp connection retry to http server so servers can be started in any order


Former-commit-id: 2482a58273 [formerly cd0e1e271a] [formerly 7b085f62de] [formerly 2482a58273 [formerly cd0e1e271a] [formerly 7b085f62de] [formerly f44f1212dd [formerly 7b085f62de [formerly 1e52606fe709f2cf27f835363ca5ab2bf6ada912]]]]
Former-commit-id: f44f1212dd
Former-commit-id: 19bb5d8de9 [formerly c446513912] [formerly c63989e0c0ae952f12584b6484f4cc133f757e99 [formerly 0790849f03]]
Former-commit-id: ac49a09e913b78ca7f067ef864505a1f0acc5ede [formerly 8b1a00fb2f]
Former-commit-id: 8d9da2b63e
2014-03-04 16:02:25 -06:00
Benjamin Phillippe
d51e7a67a0 Issue #2769: Added batching to registry sync
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db

Former-commit-id: 7ad21da089 [formerly 7bf51d507e] [formerly 59323be87e] [formerly 7ad21da089 [formerly 7bf51d507e] [formerly 59323be87e] [formerly 9fd35140f0 [formerly 59323be87e [formerly a265027cacde7690171d30455227c5a843e0d397]]]]
Former-commit-id: 9fd35140f0
Former-commit-id: fe6d70a38f [formerly daeb8bec5f] [formerly 5c8dacb79a884329e899f0613609bd34935428e9 [formerly cd04d7dcbe]]
Former-commit-id: 80271981040d34f22e2ae5038a50b6a25a0fe9ba [formerly 6b6a5b0e4f]
Former-commit-id: d0999c05e8
2014-03-04 13:31:41 -06:00
Richard Peter
f451950ced Merge "Issue #2769: Registry database deadlocking fixes/performance improvements" into omaha_14.2.1
Former-commit-id: 2b5339e16f [formerly 5280398130] [formerly aa8e1a3625] [formerly 2b5339e16f [formerly 5280398130] [formerly aa8e1a3625] [formerly f9bd27c061 [formerly aa8e1a3625 [formerly 26cbe68f0a86660968016da88a4b51d1735e8227]]]]
Former-commit-id: f9bd27c061
Former-commit-id: 75f96fe190 [formerly a81447f434] [formerly d8b132631aeda3ce7743ca02d1af158db917cca9 [formerly 3b800bcc09]]
Former-commit-id: 3fe7fe9495699d8d98fce4cdb1e4d967ad5f3330 [formerly 9ce19b16cc]
Former-commit-id: 0219b80555
2014-03-04 12:54:23 -06:00
Richard Peter
9bacf68628 Merge "Issue #2791 Use Data Source for all grid data access." into development
Former-commit-id: 83b99aad5c [formerly 090829f75e] [formerly f87a913017] [formerly 83b99aad5c [formerly 090829f75e] [formerly f87a913017] [formerly 873fa00fac [formerly f87a913017 [formerly 0b9954f00ca5f5a61a1cd79d094408e43b115abe]]]]
Former-commit-id: 873fa00fac
Former-commit-id: 7e096adc4a [formerly 3a96d0758a] [formerly 31ea5b7bbf5848e0ada30ca517c3c6b17e7d4154 [formerly 2a5b0fb3ba]]
Former-commit-id: 20555b967806297585643060463c34a49a7adbb0 [formerly dfa3f06e8e]
Former-commit-id: 13bad4e99e
2014-03-04 12:43:17 -06:00
Nate Jensen
83bbb7c454 Merge "Issue #2870 log product id when generic packet fails to find corresponding packet class" into development
Former-commit-id: e74b0c2854 [formerly d0e405aac9] [formerly ea0248ff96] [formerly e74b0c2854 [formerly d0e405aac9] [formerly ea0248ff96] [formerly 4547cbcfea [formerly ea0248ff96 [formerly 51797cd167b76be2b3ab55b6c7632e0039d7145c]]]]
Former-commit-id: 4547cbcfea
Former-commit-id: fc953460b7 [formerly 2dba0228c2] [formerly 9e20fa9103fca3117e471be18adfb89e0f743437 [formerly 471492201c]]
Former-commit-id: 46fc821d91d7c735a7f7a67dd14aeb53d55cb2d8 [formerly f088ff8a4e]
Former-commit-id: 3baaa6e941
2014-03-04 12:39:13 -06:00
Richard Peter
0432201d65 Merge "Issue #2829 - fix the spelling of 'coordinate' in GfeUtil" into development
Former-commit-id: 560d3ea59f [formerly 650f794329] [formerly bd94f6bf99] [formerly 560d3ea59f [formerly 650f794329] [formerly bd94f6bf99] [formerly 4fbb2f0059 [formerly bd94f6bf99 [formerly 12458982fe4c43a9b61e9194246c80527d02da6d]]]]
Former-commit-id: 4fbb2f0059
Former-commit-id: eb84b01b25 [formerly 58f05e288f] [formerly 5a213f229ea6ad72f4cd884b9d5a24db5f6d4023 [formerly 363e9e294f]]
Former-commit-id: b7e6d2d243f38ec344126b8f5d768567ef12fec1 [formerly 2aedbc961d]
Former-commit-id: 351998e947
2014-03-04 12:38:30 -06:00
Richard Peter
de546a29c1 Merge "Issue #2713 Update path for MADIS-Harvester.xml Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788" into development
Former-commit-id: f343b87101 [formerly 15c9066986] [formerly bc8b838a41] [formerly f343b87101 [formerly 15c9066986] [formerly bc8b838a41] [formerly 178bfc0b79 [formerly bc8b838a41 [formerly 234b6b7010e6eb044fbf1fc4728a58dc5cb84c8e]]]]
Former-commit-id: 178bfc0b79
Former-commit-id: 58e8cc7dd3 [formerly b3c2df969a] [formerly a0e4b52a5d8449aeb28040899d5f6f7c762141e4 [formerly e350b5bae1]]
Former-commit-id: a5bcbd30fbabf71de65110f449840c0ef62526e5 [formerly 000c577656]
Former-commit-id: 588b95db5c
2014-03-04 12:38:07 -06:00
Nate Jensen
3c67e87a9d Issue #2870 log product id when generic packet fails to find
corresponding packet class

Change-Id: I839e622b063eae4e707f9abc31f010ef795bc9f1

Former-commit-id: 02a7daf658 [formerly ef05ddc408] [formerly a1caeae552] [formerly 02a7daf658 [formerly ef05ddc408] [formerly a1caeae552] [formerly 6818ea9c23 [formerly a1caeae552 [formerly 0d01b387e454f276d0ebdecfb14ad294b67a55b7]]]]
Former-commit-id: 6818ea9c23
Former-commit-id: c8f3303317 [formerly b095d91c92] [formerly 147db2f60cd783078998957a4fefc35f48373315 [formerly 552a2af0b9]]
Former-commit-id: 649d94632ba158d384135559674876992cb43872 [formerly 6139ef3461]
Former-commit-id: c183d7bd51
2014-03-04 11:52:34 -06:00
Nate Jensen
58e0eac1ba Merge "Issue #2673 Add ability to query only ref times to Data Access Layer." into development
Former-commit-id: 6389e2fb02 [formerly 92e8393915] [formerly 3afd14e1eb] [formerly 6389e2fb02 [formerly 92e8393915] [formerly 3afd14e1eb] [formerly 9b94434a78 [formerly 3afd14e1eb [formerly eb07c44098abe7f72b578e24a4a7ea7e92dc655c]]]]
Former-commit-id: 9b94434a78
Former-commit-id: be64298394 [formerly c58926d598] [formerly 813a67cfd0eabada60dcb3b8d68f61ef21cd4c70 [formerly 93da8c2075]]
Former-commit-id: 558594ea25630ed22d18a2569d571a598ec72d53 [formerly cd17f7b63f]
Former-commit-id: 0ee8c9e58a
2014-03-04 11:42:51 -06:00
John.McPherson
a04bce1334 ASM #113 DR 16464 rsync_parms.site may not always exist for Service Backup
Change-Id: I2abbb68dcbd064483a262ddba4b9ab9e0dee211a

Former-commit-id: 43f04342eb [formerly 058bb8d60e] [formerly bdbe5577e9] [formerly 43f04342eb [formerly 058bb8d60e] [formerly bdbe5577e9] [formerly 2d8ce4e577 [formerly bdbe5577e9 [formerly 4d9b74dc181c359681eda8bae04f7c46f41d5769]]]]
Former-commit-id: 2d8ce4e577
Former-commit-id: 32a8e0cd90 [formerly f1eeaf6580] [formerly 417005f990612d7bc085d5a7ba17873c67485e17 [formerly 218f2de16a]]
Former-commit-id: af2be08dd992ae4a8ee9f4a3faaf03bdbdcbdbd1 [formerly d75de22f67]
Former-commit-id: 24389e3792
2014-03-04 17:24:00 +00:00
Nate Jensen
587d8e5e1b Issue #2813 fix subscription package names
Former-commit-id: 645fec513a [formerly af76b58b27] [formerly 0ec866f1d2] [formerly 645fec513a [formerly af76b58b27] [formerly 0ec866f1d2] [formerly d7d0803ee9 [formerly 0ec866f1d2 [formerly 081b621b5932d77c03117840e887ed7017f1d48b]]]]
Former-commit-id: d7d0803ee9
Former-commit-id: b920fdd0aa [formerly 78b2b50370] [formerly d585d2501f41607fabbcad8c30a1a4244b7f07c5 [formerly df44f8246e]]
Former-commit-id: e577998904a8996099ae83537da7ff39cf515283 [formerly e22b486f25]
Former-commit-id: 5132a0f8cb
2014-03-04 10:53:58 -06:00
Brian.Dyke
c8111a7ebb OB_14.1.1-21 baseline
Former-commit-id: 5179a4f970 [formerly 271ec85c0c] [formerly 1d92e5bab6] [formerly 5179a4f970 [formerly 271ec85c0c] [formerly 1d92e5bab6] [formerly 29681c7ca4 [formerly 1d92e5bab6 [formerly d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b]]]]
Former-commit-id: 29681c7ca4
Former-commit-id: c1ef56e0d7 [formerly c68649b4f9] [formerly 146eb0a75db603df40a613354b8cbc0908ec3abb [formerly 7cad374af5]]
Former-commit-id: db6e513aaa9a15a7b11a5aee1b3716c9a5587928 [formerly 079cc93f89]
Former-commit-id: ea56516bf5
2014-03-04 11:47:42 -05:00
Bryan Kowal
5aeecb8668 Issue #2829 - fix the spelling of 'coordinate' in GfeUtil
Former-commit-id: 5ded2afc7b [formerly 83471b4900] [formerly e6ae710871] [formerly 5ded2afc7b [formerly 83471b4900] [formerly e6ae710871] [formerly 56e79f2179 [formerly e6ae710871 [formerly a06c8efe8b316359cfb0d4feaa7ea8f36e4122e7]]]]
Former-commit-id: 56e79f2179
Former-commit-id: b5840bb880 [formerly 3c42fa358e] [formerly 25690eebf00737ce2c3db1b4cd9bff6a9a40ab7f [formerly eda1dc4142]]
Former-commit-id: f639aaed1d50293e626eefeaa33fcb6cdada48fa [formerly 832aca28ee]
Former-commit-id: 34c1a79ec8
2014-03-03 17:45:09 -06:00
Ben Steffensmeier
31cc3a237b Issue #2673 Add ability to query only ref times to Data Access Layer.
Former-commit-id: 2807ec9b07 [formerly 2230164e1f] [formerly 641d4acd15] [formerly 2807ec9b07 [formerly 2230164e1f] [formerly 641d4acd15] [formerly 9fcb730858 [formerly 641d4acd15 [formerly 37c406a9945bfb6ccb99d2472b44d649f2ce18d0]]]]
Former-commit-id: 9fcb730858
Former-commit-id: 3613b62fe1 [formerly b9b5068329] [formerly 614b30500251a3eee6fb9711755f92aabf706b56 [formerly 1d2d1e20f5]]
Former-commit-id: 48d6ac2942a8a7ef98a1259ca7320bedf1f46da9 [formerly 4f01f96cf4]
Former-commit-id: 9d757d79e2
2014-03-03 17:44:11 -06:00
Brian Clements
08c686bfa7 Issue #2756 install script for collaboration http server
added check for non-edex deployment in plugin-methods.xml
added dataserver feature to use feature-based deployment scripts
moved start/stop scripts to subdirectory
reworked start script to work with external classpath jars


Former-commit-id: 769ee18145 [formerly a738448825] [formerly 3b6121b9fa] [formerly 769ee18145 [formerly a738448825] [formerly 3b6121b9fa] [formerly 934ce73e4b [formerly 3b6121b9fa [formerly 7d476e67ad00cc8e9c494ed04c7ce0ecc691059a]]]]
Former-commit-id: 934ce73e4b
Former-commit-id: 11b30001d5 [formerly 75c179b06f] [formerly 066c81f999fa0b82f0f2cf806a4411393bd5ac3c [formerly a44c5f8d48]]
Former-commit-id: 0e0bd6fdd76a9a44b31ab23824202bfa97b827e6 [formerly a36f303646]
Former-commit-id: 861716341a
2014-03-03 14:07:01 -06:00
Benjamin Phillippe
eb7e448d08 Issue #2769: Registry database deadlocking fixes/performance improvements
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0

Former-commit-id: ea31c5b370 [formerly d339e232f4] [formerly ed050996a2] [formerly ea31c5b370 [formerly d339e232f4] [formerly ed050996a2] [formerly 5483d6d7ae [formerly ed050996a2 [formerly a4e02448e88b8b0bbad62794b41d0ef1bd1c6b6e]]]]
Former-commit-id: 5483d6d7ae
Former-commit-id: 71d5fbda33 [formerly 603e433054] [formerly d73e719f11d2bc9e27c664078a07b85c55da2615 [formerly 15a5e7c4a4]]
Former-commit-id: 63cf34563d5f8d452ff9585e79b5e00f900f9f9c [formerly 090dbe3918]
Former-commit-id: 719b90e1e7
2014-03-03 10:57:16 -06:00
Juliya Dynina
b65af19301 Merge "ASM #78 - Fix MDCRS display" into asm_14.2.2
Former-commit-id: fbe297b24b [formerly 6fd59caff3] [formerly 0130876a7a] [formerly fbe297b24b [formerly 6fd59caff3] [formerly 0130876a7a] [formerly 4bc91be899 [formerly 0130876a7a [formerly 081b98f0e1a2dad2d4aff981cbe9980e0c97e12a]]]]
Former-commit-id: 4bc91be899
Former-commit-id: 5e4f8d03ef [formerly 6e3dbfdff7] [formerly accedf49cbe87e91b7157b357a1dcb1372fcc111 [formerly 7a30b05e9a]]
Former-commit-id: 8c16280a266a39f3518b5379e8ad663acc9cddbb [formerly b0e3794ce8]
Former-commit-id: 42a1294ce4
2014-03-03 11:27:39 -05:00
Dave Hladky
50a6b4364c Issue #2713 Update path for MADIS-Harvester.xml
Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788

Former-commit-id: afef25c604 [formerly fb2cfff4d2] [formerly 92d677141f] [formerly afef25c604 [formerly fb2cfff4d2] [formerly 92d677141f] [formerly d40107e530 [formerly 92d677141f [formerly f6e63a5d65a5450eb58e59833091b41ef4bf0a3f]]]]
Former-commit-id: d40107e530
Former-commit-id: b39450bcd2 [formerly dd3501ae41] [formerly 758b85a458cc5427609844effdd15c25ff39ee6d [formerly 06d41ccafa]]
Former-commit-id: 55ca7aac9f711727703959425f270f4e46bf36b8 [formerly ee818ff96b]
Former-commit-id: f03f0f9092
2014-03-03 08:46:37 -06:00
Ben Steffensmeier
c8bb28c753 Issue #2791 Use Data Source for all grid data access.
Former-commit-id: 16b6723cbb [formerly 02cef4ddaa] [formerly 6fa441396f] [formerly 16b6723cbb [formerly 02cef4ddaa] [formerly 6fa441396f] [formerly 05770129c1 [formerly 6fa441396f [formerly 961c232e35da077ef4fc0b62cb04a8f4cb9fb6f0]]]]
Former-commit-id: 05770129c1
Former-commit-id: 374ad2c1e8 [formerly 72b117cf42] [formerly bc40fd62dff2b342470d96a6441fc6239af6c193 [formerly 4094ef6170]]
Former-commit-id: bdf87913f359fbfcf11e0a003cf174b9addc76f9 [formerly c6f1b922b2]
Former-commit-id: a19e960342
2014-02-28 17:06:33 -06:00
Brian Clements
e9604a9700 Issue #2756 implemented HTTP public key auth scheme
collaboration HTTP server now requires auth header (configured via openfire)
added auth to cave client


Former-commit-id: fd18963221 [formerly 9d0b02e0a4] [formerly ce24bd1018] [formerly fd18963221 [formerly 9d0b02e0a4] [formerly ce24bd1018] [formerly d8e283e1b4 [formerly ce24bd1018 [formerly e0e4dfdedff283c809060257fbf04e777faf318d]]]]
Former-commit-id: d8e283e1b4
Former-commit-id: 43c19f09ba [formerly f56cbac9fb] [formerly effe9ab4a85983edf2b983ee5e4b964df8a78343 [formerly edd72cbde4]]
Former-commit-id: 667a1021c89300b5befe11701d18fc1d06fbb6bb [formerly 6d4abdc37c]
Former-commit-id: f00f8eb1d9
2014-02-28 16:15:17 -06:00
Nate Jensen
b2859ba495 Merge "Issue #2836 Added diagnostic info for ArrayIndexOutOfBounds exception" into development
Former-commit-id: 15cbcdcbff [formerly 2557ffe8c3] [formerly 47255ea9ad] [formerly 15cbcdcbff [formerly 2557ffe8c3] [formerly 47255ea9ad] [formerly 45e8290111 [formerly 47255ea9ad [formerly 4ad72fcdc6cdccfce9f14808bdbcba5fa63d28ac]]]]
Former-commit-id: 45e8290111
Former-commit-id: cced1d17c5 [formerly 988249c4d8] [formerly faaad66bd2ab6b8c2729152ba1bb0b3e77069a4e [formerly 6d41fc9fd2]]
Former-commit-id: d1da787838b5c47b3c864eca5eea18ac8d2220fe [formerly aa28135a16]
Former-commit-id: da3ac6ab07
2014-02-28 14:02:33 -06:00
Nate Jensen
17e33458d0 Merge "Issue #2638 wrote java utility for generating list of data URIs and their field names" into development
Former-commit-id: 28ccecc515 [formerly 420a30cddc] [formerly 135bb70a38] [formerly 28ccecc515 [formerly 420a30cddc] [formerly 135bb70a38] [formerly f21e9eb889 [formerly 135bb70a38 [formerly f7da1e27eca42ff822eeccf5a4a4bb56c77eb868]]]]
Former-commit-id: f21e9eb889
Former-commit-id: 778d6540f7 [formerly 403a8611c5] [formerly f0f85d0571b8d99ff0283fed753ee0778365a7f5 [formerly 67a7197f59]]
Former-commit-id: 38918599b02ac41a94645b5b68c05f846806643e [formerly 636cb1b4c1]
Former-commit-id: 58b4cdebad
2014-02-28 14:02:22 -06:00
Ben Steffensmeier
19f976b1d3 Issue #2791 Switch contouring to use DataSource for data access.
Former-commit-id: 7c8332a30f [formerly fbf6371c8e] [formerly 4b7f3b2a5b] [formerly 7c8332a30f [formerly fbf6371c8e] [formerly 4b7f3b2a5b] [formerly 23ce77d864 [formerly 4b7f3b2a5b [formerly 6c90be7554bcbbf0aeb363b6e76c455d3896be83]]]]
Former-commit-id: 23ce77d864
Former-commit-id: b747a91eaa [formerly 278ef9f0d4] [formerly 527028ea9c54386652ea6e4a25326acedb61a15d [formerly a7787a7ff2]]
Former-commit-id: 53b3adff68d425a61d02a8ceaf904f17b0aa8efa [formerly c0c017e451]
Former-commit-id: 118991ec22
2014-02-28 11:28:02 -06:00
Dave Hladky
5b09ce0e02 Issue #2836 Added diagnostic info for ArrayIndexOutOfBounds exception
Former-commit-id: fcd9f02b5c [formerly 8bddfa77ce] [formerly fd85324076] [formerly fcd9f02b5c [formerly 8bddfa77ce] [formerly fd85324076] [formerly 7399b10778 [formerly fd85324076 [formerly 137c6f8848715ee1acaaa2be943c053437902a8c]]]]
Former-commit-id: 7399b10778
Former-commit-id: c15437bff8 [formerly d9a0f99bb5] [formerly c6da2ffbb885334fdece65551dc7f61d9bcab9c0 [formerly 62156a1ba5]]
Former-commit-id: 01b5f219fe2a311b750e13d618e59ed11b2f8bfb [formerly b5b9e295fb]
Former-commit-id: 5d37ad762d
2014-02-28 11:07:15 -06:00
Richard Peter
b1546c7cc5 Merge "Issue #2838 Archive binary feeder creation." into development
Former-commit-id: ddc733fda6 [formerly 944ea7936c] [formerly 952669fc38] [formerly ddc733fda6 [formerly 944ea7936c] [formerly 952669fc38] [formerly 475557d4c8 [formerly 952669fc38 [formerly c8ab23e68f870a6fc46171b9076e09689bc1b5bb]]]]
Former-commit-id: 475557d4c8
Former-commit-id: 61be7a7225 [formerly 67a6ef4bd8] [formerly 3e47cae010b1d02395c7d662563fa5fddde5e973 [formerly 1d51a87e86]]
Former-commit-id: f78a4f05cb510f0fa86967f4944e7d59be253cf2 [formerly db1e7f8f48]
Former-commit-id: 1103fb5eff
2014-02-27 17:36:56 -06:00
Nate Jensen
879743ba05 Issue #2638 wrote java utility for generating list of data URIs and
their field names

Change-Id: I44435ed2a3f1f812b79b3d4fa906913064c60863

Former-commit-id: b64a89eff1 [formerly 5b2f17826e] [formerly 7fb97ffad0] [formerly b64a89eff1 [formerly 5b2f17826e] [formerly 7fb97ffad0] [formerly 39e167fc76 [formerly 7fb97ffad0 [formerly a3e2218d1fcc7cf8c83443f5f29cd9982b7e6f46]]]]
Former-commit-id: 39e167fc76
Former-commit-id: 0e29ec5bb4 [formerly f3de646859] [formerly 76c109bc0aaf7a0a1405976cdefd262abdaf71dc [formerly 8bf8302811]]
Former-commit-id: 0a41af5b8c365750116c369470ba9b31fd6bc188 [formerly f325498ec3]
Former-commit-id: b051dab483
2014-02-27 17:14:32 -06:00
Nate Jensen
0dce8ad18f Merge "Issue #2823 deploy install now defaults to x86_64." into development
Former-commit-id: 1a94acc527 [formerly 82817c2cbd] [formerly f7b4c75f13] [formerly 1a94acc527 [formerly 82817c2cbd] [formerly f7b4c75f13] [formerly d7a8ddbb83 [formerly f7b4c75f13 [formerly 75be0d86a588209ff572362f098095beb0b618d2]]]]
Former-commit-id: d7a8ddbb83
Former-commit-id: ce34239347 [formerly c439ecb2a4] [formerly 925ea42657cfdc93cc2d496f645202a2d2a00011 [formerly 35ea5b9eb2]]
Former-commit-id: 656ea87fefd83f8c9187b6fc8ebc12377de97394 [formerly 8b7fecdd99]
Former-commit-id: d286ba624c
2014-02-27 16:44:26 -06:00
Brad Gonzales
8cc15b1c3b Issue #2823 deploy install now defaults to x86_64.
Change-Id: I06034fd03ab3779d83522134cb8067a64c2dcecc

Former-commit-id: f84150e7a0 [formerly 73ed932660] [formerly 2135663934] [formerly f84150e7a0 [formerly 73ed932660] [formerly 2135663934] [formerly 45160326aa [formerly 2135663934 [formerly 9ef72acfce925dfcfc0df07e7ca5fb558b54d934]]]]
Former-commit-id: 45160326aa
Former-commit-id: 78cafe46d5 [formerly 003f028176] [formerly 198c4e59dcbb38b466db464ed3ce8ffb0ea02484 [formerly 90e6558083]]
Former-commit-id: 5c8f4af5de6c86b4d6558f7730d51d7fc3919371 [formerly b6dbc7f605]
Former-commit-id: 562245f2af
2014-02-27 16:34:53 -06:00
Richard Peter
ef2ff1d0f7 Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java

Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75

Former-commit-id: 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 1d6e9816e0 [formerly 50a1b270c5] [formerly 23c2e13876eeacd0c485ad3110006f8bd36a537c [formerly f13c86bc3e]]
Former-commit-id: 1916128dada6d785b45f3c66eda571278ddb03d7 [formerly 9b3f8f9649]
Former-commit-id: 5fab51d41b
2014-02-27 15:18:26 -06:00
Melissa Porricel
8f94fbbfec ASM #78 - Fix MDCRS display
Change-Id: I28b6788f822100469f0fe292197b6020381e6e38

Former-commit-id: ce444f1ea0 [formerly 20624da288] [formerly 769fc1ed2f] [formerly ce444f1ea0 [formerly 20624da288] [formerly 769fc1ed2f] [formerly e5213e9415 [formerly 769fc1ed2f [formerly 2c655d5313882f811219c7a16f713d977008f949]]]]
Former-commit-id: e5213e9415
Former-commit-id: 6438d70b85 [formerly 8daf0520bc] [formerly 738d69c8e5a1f10b847ad7775268f2abe518e72b [formerly 774e236d63]]
Former-commit-id: 97df7b9cde72aecd786e37551eb3da8b9d03a6d6 [formerly eafea2f5ee]
Former-commit-id: adc09f6896
2014-02-27 12:48:09 -05:00
Roger Ferrel
a47b877f44 Issue #2838 Archive binary feeder creation.
Change-Id: I4e431d62e3d27565af75d52012fe042a18fd1f9c

Former-commit-id: 98bd4174d3 [formerly ac03675880] [formerly 9b7715e5e0] [formerly 98bd4174d3 [formerly ac03675880] [formerly 9b7715e5e0] [formerly 995d962a66 [formerly 9b7715e5e0 [formerly 16c38960863df2f993c6ee7e18de31824cbdbb08]]]]
Former-commit-id: 995d962a66
Former-commit-id: 592bbd8241 [formerly dae52ad3a0] [formerly 8b2aa969d1f1fe5980fc422623cca4e71e6d36fc [formerly 03843090fa]]
Former-commit-id: 78ebd5a1d7d77f8dc49f5bbc17e2c05c508f1e9d [formerly 40369d124f]
Former-commit-id: 1b29ee087f
2014-02-27 07:45:40 -06:00
Brian.Dyke
7316b34ef5 OB_14.1.1-20 baseline
Former-commit-id: 2613e13e08 [formerly b2401d2f0d] [formerly 324696c436] [formerly 2613e13e08 [formerly b2401d2f0d] [formerly 324696c436] [formerly 2bad40cfee [formerly 324696c436 [formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]]]
Former-commit-id: 2bad40cfee
Former-commit-id: 89b66fcb5b [formerly c873f20d04] [formerly ed8e6914deb29235289414c9240bc93a504f11a5 [formerly 16117255f3]]
Former-commit-id: 9b0f4d8a2c398c18300fab2c3d13cb0bf783a1ef [formerly 5feadbe4d9]
Former-commit-id: f9587d39d1
2014-02-26 17:39:15 -05:00
Ben Steffensmeier
b4f8468f87 Issue #2711 Use level factory more.
Former-commit-id: 3d9b435262 [formerly 1069ef8d67] [formerly d7a3ae4fdb] [formerly 3d9b435262 [formerly 1069ef8d67] [formerly d7a3ae4fdb] [formerly 3da086b71f [formerly d7a3ae4fdb [formerly db58ae5999ea088cb93a8016836a6c62efe347e4]]]]
Former-commit-id: 3da086b71f
Former-commit-id: 4d1276def2 [formerly 29f9a87085] [formerly 81be956862611f9499f1e2716026d69eacf91f27 [formerly f45646ae91]]
Former-commit-id: ac87ec8ef2e20c2296cc8f89005a894dbccc5be1 [formerly 3a5f655ea4]
Former-commit-id: 0dd62678f2
2014-02-26 15:10:40 -06:00
steve.naples
bbffc7e992 ASM #236
Change-Id: I849aa9c15622973e49f385ada9df84ba3b1417dd

Former-commit-id: 4400821f53 [formerly 06f619b3ff] [formerly 6be82c41fc] [formerly 4400821f53 [formerly 06f619b3ff] [formerly 6be82c41fc] [formerly cc9e62c806 [formerly 6be82c41fc [formerly 8d0e82a46186f3457c5d4e3001548d067ebbaae2]]]]
Former-commit-id: cc9e62c806
Former-commit-id: f4c11adcfc [formerly 1c6f6be15e] [formerly 739ab9214214a58ad3716378a60a67bab5d677fe [formerly 9b850d81df]]
Former-commit-id: 728fca809416a733d3b5932fd1544dbb7fcf3dfd [formerly 73e5bc8949]
Former-commit-id: 2e088612ec
2014-02-26 18:54:36 +00:00
Slav Korolev
ea9b31b24b Issue #2652. Fixed issue with edex-text-ingest log.
Former-commit-id: 6d4cf7476f [formerly a34b1196b7] [formerly 5087a0154d] [formerly 6d4cf7476f [formerly a34b1196b7] [formerly 5087a0154d] [formerly bfa84e65ec [formerly 5087a0154d [formerly 728e5b2d7ecad662e0c876533726d4bdd5c265d7]]]]
Former-commit-id: bfa84e65ec
Former-commit-id: b8e48e1740 [formerly 0566c86a6c] [formerly fa4d07cf875d177a851b8a0990f11bc8ec215736 [formerly 40b4bf6e8e]]
Former-commit-id: 12d59f30d6e7039021ded78217db65a4b236a048 [formerly 5e494af996]
Former-commit-id: 9dd91d63c1
2014-02-25 15:23:22 -05:00
Richard Peter
aac768e805 Merge "Issue #2469 Fixed default rules implementation" into omaha_14.2.1
Former-commit-id: 2c433bb05c [formerly 90b48e0393] [formerly 3735cd3ffe] [formerly 2c433bb05c [formerly 90b48e0393] [formerly 3735cd3ffe] [formerly b4e48698ed [formerly 3735cd3ffe [formerly 937157a12ca783ead50ad4ddaec4e1679ea47e62]]]]
Former-commit-id: b4e48698ed
Former-commit-id: 85a16601ed [formerly f803d557c2] [formerly d78cc4dd432220d2d29a4c19ab555ecd83067517 [formerly 66b271a550]]
Former-commit-id: 5b87edac1a20018c339b438ff189f180ab2dc96a [formerly e78e5a15b9]
Former-commit-id: e28b3bb5b9
2014-02-25 12:34:38 -06:00
Brad Gonzales
ac050068d5 Issue #2386 fixed spatial overlap rule application.
Amend: updates from peer review.

Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22

Former-commit-id: 39afe190e0 [formerly b6e2ce4b74] [formerly 783afb1585] [formerly 39afe190e0 [formerly b6e2ce4b74] [formerly 783afb1585] [formerly 8b2b50baaf [formerly 783afb1585 [formerly 807f278d542bc36331aa83b46a86a3af9dbb6675]]]]
Former-commit-id: 8b2b50baaf
Former-commit-id: c364269fae [formerly f57f472f6a] [formerly 0b393405d83191a17ccf6537e803d672cbc79eae [formerly 5ce1939d01]]
Former-commit-id: 4945cd39a9cc275d1c7a6df8d10b99e4aea2962c [formerly f4513d0e64]
Former-commit-id: aa2d8b76a1
2014-02-25 09:22:08 -06:00
Brian.Dyke
9db7ca881a Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 9158806dd2 [formerly 363403fb34] [formerly 2faab606e5] [formerly 9158806dd2 [formerly 363403fb34] [formerly 2faab606e5] [formerly 1a8a0b703e [formerly 2faab606e5 [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: 6b1b6d38e3 [formerly 73a1c238f4] [formerly c32d7953dc94373551f79bad9831cf9ef8cced7c [formerly 227131e5f1]]
Former-commit-id: b22adde77eff6179b00b4c7389d58bbde1684f4b [formerly 38829b9014]
Former-commit-id: 0bcf7c89b8
2014-02-24 14:51:00 -05:00
Ron Anderson
5eb76e8ed6 Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE

Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962

Former-commit-id: 049424e5f0 [formerly 45ccac0859] [formerly 4364e7497c] [formerly 049424e5f0 [formerly 45ccac0859] [formerly 4364e7497c] [formerly 2db5f26840 [formerly 4364e7497c [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]]
Former-commit-id: 2db5f26840
Former-commit-id: 5831f8d79e [formerly 7d3af157f8] [formerly a242c09c6983c820aa32c052d7deaed21a0982ec [formerly 3b2ea2d6ac]]
Former-commit-id: 50ec6dfad53c87f1ad4174e64fdb142803fcaf62 [formerly f2b0cc20e8]
Former-commit-id: 3c673caec2
2014-02-24 13:46:48 -06:00
Nate Jensen
0d8cd5360a Merge "Issue #2762 Use UCUM to format units so IRPixel formats correctly." into omaha_14.2.1
Former-commit-id: 4af8a7f326 [formerly 98a6101cd3] [formerly 2111109ce2] [formerly 4af8a7f326 [formerly 98a6101cd3] [formerly 2111109ce2] [formerly b1586f8603 [formerly 2111109ce2 [formerly cd4472f65c07f28d6aee26df748d44568405a9b1]]]]
Former-commit-id: b1586f8603
Former-commit-id: 1837a83743 [formerly d6e9cb73f5] [formerly 9d8fe1a0158253d440a5c43e42535da472859450 [formerly bf8bb95f51]]
Former-commit-id: 6f49258d52063f413dae43a0a944ac2785e75d66 [formerly 6979321635]
Former-commit-id: da2a363550
2014-02-24 13:25:35 -06:00
Dave Hladky
2ed6aabcb0 Issue #2469 Fixed default rules implementation
Former-commit-id: d31708962b [formerly f9c6a396f0] [formerly 1d256bfcee] [formerly d31708962b [formerly f9c6a396f0] [formerly 1d256bfcee] [formerly 45413d0db4 [formerly 1d256bfcee [formerly 9f5d3a8fefb7c9977533c8c3770e14e5a5e09f72]]]]
Former-commit-id: 45413d0db4
Former-commit-id: 05c81677d2 [formerly dc97eb7890] [formerly 3d6c4cab1cd2a6a85a35b82eb0d57119b5630f76 [formerly ff5a5961db]]
Former-commit-id: ca019feb8178be88e796a82d279fda02bcfa070a [formerly 8a924bcc2c]
Former-commit-id: e030ac65b2
2014-02-24 13:06:52 -06:00
Ben Steffensmeier
762a32fab9 Issue #2762 Use UCUM to format units so IRPixel formats correctly.
Former-commit-id: 669b580920 [formerly f7c48b24bb] [formerly 9e5f7d90a0] [formerly 669b580920 [formerly f7c48b24bb] [formerly 9e5f7d90a0] [formerly f8cc0e3d95 [formerly 9e5f7d90a0 [formerly b5949935eaa071ec2a56c48f32fbc3a4714d2056]]]]
Former-commit-id: f8cc0e3d95
Former-commit-id: 59c34458ff [formerly 3c7e578000] [formerly 8c6b48d405e8efd0e175f4ea9f8f0320fd5743ea [formerly a510abdb22]]
Former-commit-id: 0e5366ec874b8f9ecca31d3710cb6e5de118326b [formerly 358e7d3b1d]
Former-commit-id: 831bb0b021
2014-02-24 10:27:30 -06:00
John.McPherson
3d919d78f0 ASM #209 DR 16362
Change-Id: Ide103349188f12f3b1350bea75f80b225def13e7

Former-commit-id: 90ab3a4331 [formerly ea0dc8b3dc] [formerly 1d987c36d9] [formerly 90ab3a4331 [formerly ea0dc8b3dc] [formerly 1d987c36d9] [formerly bbd70c06f1 [formerly 1d987c36d9 [formerly b01f04471631f5e2c24dba77f7e96b72444becff]]]]
Former-commit-id: bbd70c06f1
Former-commit-id: 0132b51bb3 [formerly acf30e83bf] [formerly eadb2e218caf8cf873f770c74881c5170f7f9926 [formerly ae671c3601]]
Former-commit-id: e29111a9555688f35eea1a9b4f6d25176eb100cd [formerly dbad6b2701]
Former-commit-id: 995015a0ca
2014-02-24 03:07:21 +00:00
Dave Hladky
15edb8e522 Issue #2636 Try Catch around the MaintTask
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285

Former-commit-id: cd7934e12f [formerly 542ba7e504] [formerly 853a2d40ef0728def40ef035b20235c1973a76a6 [formerly c4bed432da]] [formerly cd7934e12f [formerly 542ba7e504] [formerly 853a2d40ef0728def40ef035b20235c1973a76a6 [formerly c4bed432da]] [formerly 49f6c31256 [formerly c4bed432da [formerly 60c9027b219f3de7193320e5a55911c740e58f30]]]]
Former-commit-id: 49f6c31256
Former-commit-id: e15d2f50f9 [formerly 3b9f80d03e] [formerly de3f95e5f61e7ea15849603d3138b155fe401280 [formerly 445b55f796]]
Former-commit-id: 1b4853e591b02029ef646ca2512a6fb8faddce26 [formerly c545368839]
Former-commit-id: c4e70210fd
2014-02-21 16:01:20 -06:00
Brian.Dyke
de9e6553a9 OB_14.1.1-19 baseline
Former-commit-id: 3508e488f5 [formerly 779553142c] [formerly cfa4997978] [formerly 3508e488f5 [formerly 779553142c] [formerly cfa4997978] [formerly 10b723647b [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]]
Former-commit-id: 10b723647b
Former-commit-id: 5a11fbbfdb [formerly c41dd22ff2] [formerly f52dfb462cf92e04bf51f942fd80bfc621074563 [formerly 64044e7ce5]]
Former-commit-id: 8cf9beeb99ea9f03c45e09f6c11fba57ddab3585 [formerly 1b359c2564]
Former-commit-id: f86f9f8918
2014-02-21 06:50:59 -05:00
Brad Gonzales
527eb96112 Issue #2828 Added purge cron to Central SBN Simulator.
Amend: Removed comment accidentally merged from other branch.
       Moved logging to outer loop and log count of purged files for each dir.

Change-Id: I7038e7f76d09576903d35a54e733cd6986a4d1c6

Former-commit-id: 3052b2d9c7 [formerly 290a381715] [formerly 12e22752c2] [formerly 3052b2d9c7 [formerly 290a381715] [formerly 12e22752c2] [formerly bd25ec4cd9 [formerly 12e22752c2 [formerly 6a42f4162ace5a799df4df0e24bf0199905dcf89]]]]
Former-commit-id: bd25ec4cd9
Former-commit-id: 1b59fc4647 [formerly bef4e8ee53] [formerly e919fb24b5e5ab419e4dfb1442bf1fa5d1ee68d4 [formerly 08c4d1afea]]
Former-commit-id: 214aa1b94f9b4ce96af324adcfe25c14276c8588 [formerly 675477ed66]
Former-commit-id: 7dddf974b8
2014-02-20 16:31:16 -06:00
Ron Anderson
9c77ad5ef4 Issue #2824 Registered with SiteAwareRegistry so we can stop fetching when site is deactivated.
Change-Id: I4e277656a971e7927aa2321e91ba7304351f9405

Former-commit-id: bb3577ef37 [formerly e4aeaa79f1] [formerly 6a7e4a147d] [formerly bb3577ef37 [formerly e4aeaa79f1] [formerly 6a7e4a147d] [formerly 6ccf6a56e7 [formerly 6a7e4a147d [formerly a2b2a15f1ef8e237058f1760d64021895ae27c35]]]]
Former-commit-id: 6ccf6a56e7
Former-commit-id: e2bd1327b4 [formerly 1dcaf2b790] [formerly 5022d5c01f2275eac9682199580e2e9a6b2b93e7 [formerly d63ad1b1de]]
Former-commit-id: 5e5b97037cd1e8490c7bc462cbcb300afc123568 [formerly 2eb6cb45e3]
Former-commit-id: 42048983ce
2014-02-20 12:32:31 -06:00
Juliya Dynina
65c1acefb2 Merge "ASM #118" into asm_14.2.2
Former-commit-id: ee1cebfb86 [formerly d9fecf06d2] [formerly 0f5ce6fbde] [formerly ee1cebfb86 [formerly d9fecf06d2] [formerly 0f5ce6fbde] [formerly f1a10568d6 [formerly 0f5ce6fbde [formerly f2354898d0a40ae7a19b4349d25b4204d2da3e4d]]]]
Former-commit-id: f1a10568d6
Former-commit-id: a63194a59c [formerly 8b164ca292] [formerly 07c51a1ca611ba15719519acb8b77e99388a6710 [formerly a668f336bf]]
Former-commit-id: 510c296d91fd8f62671fcd00a4c7fb9ccea2a0a7 [formerly 70d512cb7d]
Former-commit-id: 04413ee642
2014-02-20 11:23:32 -05:00