Commit graph

7154 commits

Author SHA1 Message Date
Ron Anderson
779a5f59eb Omaha #3685 Add support for sending specific products in mixed case
Change-Id: I3c7e8bfe285ce7344ddfccf28173a68f3396b126

Former-commit-id: 24989f60b0 [formerly 64162dd9c0] [formerly e729cd8814] [formerly 24989f60b0 [formerly 64162dd9c0] [formerly e729cd8814] [formerly 5d07d13aa0 [formerly e729cd8814 [formerly 18d4fc13ebbd77b3a476bc70252fae1322d631c6]]]]
Former-commit-id: 5d07d13aa0
Former-commit-id: b4f0bcf30c [formerly ba737603f1] [formerly b19a1bfd8fdde387cbe24e24036130761b12c523 [formerly 5e711922d7]]
Former-commit-id: 11e1b6d8e8ec4c312af84389b87680ad8e5d98d0 [formerly 3f248e341a]
Former-commit-id: 94c875ced4
2014-10-22 14:29:30 -05:00
Richard Peter
0fbb9afab6 Merge "Omaha #3744 Adjust cave g1 region size." into omaha_14.4.1
Former-commit-id: 0533f42bc1 [formerly 5c10fe0251] [formerly d679022b3f] [formerly 0533f42bc1 [formerly 5c10fe0251] [formerly d679022b3f] [formerly 4dc4428f62 [formerly d679022b3f [formerly 53bcf86ca4db5ad10fdd2adc3f22a18567a66507]]]]
Former-commit-id: 4dc4428f62
Former-commit-id: 80d50e7b69 [formerly fba5ab2d39] [formerly 2dff984fcb30bd687b8875b96ce5c32a81e79493 [formerly 6c35f40508]]
Former-commit-id: 70714e1fb45d48f8331718fc4f7c6a6326b7052f [formerly 73d4cc14ef]
Former-commit-id: 04023ecfe3
2014-10-22 11:18:12 -05:00
Ben Steffensmeier
11fd233962 Omaha #3744 Adjust cave g1 region size.
Former-commit-id: 9e764dfc8c [formerly 1a1fafb08a] [formerly 2c9d16911a] [formerly 9e764dfc8c [formerly 1a1fafb08a] [formerly 2c9d16911a] [formerly 19ccfa6633 [formerly 2c9d16911a [formerly a60888ed9e08f3bb56f39ef287bb6d02a49d3241]]]]
Former-commit-id: 19ccfa6633
Former-commit-id: 52386b42c7 [formerly 3117cdd13c] [formerly 56685761f98ac298ed2e4af6b94057857b4310d8 [formerly d5c85324d8]]
Former-commit-id: fa006470a1b7e8d5faf737e2d19ca8d5f5997ba5 [formerly 46e3e3b7d9]
Former-commit-id: f7bff32ffe
2014-10-22 10:30:33 -05:00
David Lovely
5abb741568 Omaha #3721 Changed Grid Data reference to a Soft Reference and reduced memory usage from X*Y to X*3.
Change-Id: I627ded464d411e7f975df088261a975657d41d9a

Former-commit-id: 5a453a42f4 [formerly 8a5c1607c9] [formerly 636e823956] [formerly 5a453a42f4 [formerly 8a5c1607c9] [formerly 636e823956] [formerly 531b62d114 [formerly 636e823956 [formerly 9a6313162a5477863d30ab0a888608ee419067a9]]]]
Former-commit-id: 531b62d114
Former-commit-id: e94ab299bc [formerly d6ba9bdbb7] [formerly 2438c874bf7fc1c19f32d09be530f3fc1131418d [formerly 44120d9fba]]
Former-commit-id: b2ce4e9ece1385e0ee85476e770112ebabe18b5c [formerly 2b2a5fcd43]
Former-commit-id: 05b6e83a4c
2014-10-21 16:06:18 -05:00
Richard Peter
5ad1a159c5 Merge "Omaha #3454 Upgrading to Hibernate 4.2.15" into omaha_14.4.1
Former-commit-id: 74250ca424 [formerly d2f0ab621f] [formerly 05784292b7] [formerly 74250ca424 [formerly d2f0ab621f] [formerly 05784292b7] [formerly 2c21e72bf3 [formerly 05784292b7 [formerly 6b2879d8180a6b6f60a340977e3254ee5eb95213]]]]
Former-commit-id: 2c21e72bf3
Former-commit-id: b88375532b [formerly 168854e078] [formerly 013499ef0dd8bdc21035aa9b130f81d09f52f2c8 [formerly 7b9653cdad]]
Former-commit-id: db2bc5bad138d9d8f2dfafb6265e6f23e2359759 [formerly b77d5b33aa]
Former-commit-id: 3a80d5c801
2014-10-21 10:51:56 -05:00
Nate Jensen
a626aec72d Merge "Omaha #3598 Update grid scripts to use DAF. Accept level information in request identifiers." into omaha_14.4.1
Former-commit-id: 092742861f [formerly 1798a75f18] [formerly 24aca9cd99] [formerly 092742861f [formerly 1798a75f18] [formerly 24aca9cd99] [formerly 73c03a3379 [formerly 24aca9cd99 [formerly 450faac664f274c1c2ce1bbc0100ecaa984309f7]]]]
Former-commit-id: 73c03a3379
Former-commit-id: f51ee29efc [formerly 1854ad5653] [formerly c38ff73fff65c4e26c0a39d1ddad372f1062a5d0 [formerly 1e3b551f4b]]
Former-commit-id: 524faaecde6338fae6847bba7b43e3b918549b54 [formerly cf8e567c18]
Former-commit-id: c81c996c4b
2014-10-21 08:55:37 -05:00
Nathan Bowler
31fb2fc525 Omaha #3598 Update grid scripts to use DAF. Accept level information in request identifiers.
Change-Id: I18011b95dc7dc2a0d92d41ce6e7864d3aaa1afbf

Former-commit-id: 13847affbe [formerly 679c836fdc] [formerly d9f75f5adc] [formerly 13847affbe [formerly 679c836fdc] [formerly d9f75f5adc] [formerly 1ff018ccdf [formerly d9f75f5adc [formerly 8b001934bef0d672bce4739accf994eba497b32c]]]]
Former-commit-id: 1ff018ccdf
Former-commit-id: 43cae5f6da [formerly 674b6c2dcc] [formerly b988090e50ef8a0a1762d20eee5f1c4b63a30f77 [formerly 23950384ee]]
Former-commit-id: 25cfb4e24c7a307568423150a2e916e770aade11 [formerly 5268e32927]
Former-commit-id: 2565e3f305
2014-10-21 07:16:18 -04:00
Nate Jensen
0d530d5ffd Merge "Omaha #3418 Fixed NPE for cell trends. Fixed possible NPE in PointsDataManager catch block." into omaha_14.4.1
Former-commit-id: a0a300082a [formerly 332fb931c6] [formerly 26c8400ac1] [formerly a0a300082a [formerly 332fb931c6] [formerly 26c8400ac1] [formerly 579f38dc62 [formerly 26c8400ac1 [formerly abd0db67d4525476a55be5c07ca8c50228c54258]]]]
Former-commit-id: 579f38dc62
Former-commit-id: fb897d5485 [formerly 2bfb26f4e6] [formerly 65e5eda3066717a08761163b25bf7e627357c455 [formerly 561e40d3d3]]
Former-commit-id: d2baa93058b12b255efdd39608e00538f46369b9 [formerly 74a3fa0607]
Former-commit-id: f6bd3b959c
2014-10-20 15:32:17 -05:00
David Lovely
bad100f9df Omaha #3418 Fixed NPE for cell trends. Fixed possible NPE in PointsDataManager catch block.
Change-Id: Ice45220f2798e4004d41fa8fe78ccad8b5737f0d

Former-commit-id: 7b66037194 [formerly f83eb3e69b] [formerly d7cd4cc845] [formerly 7b66037194 [formerly f83eb3e69b] [formerly d7cd4cc845] [formerly 2e7cade8d6 [formerly d7cd4cc845 [formerly 68d3cede303b82dd3fde23255d830289f967a889]]]]
Former-commit-id: 2e7cade8d6
Former-commit-id: 4044f76e3c [formerly 1eac8ddbe8] [formerly 01bc0440f5e4d8f0aaf9707d9b22d8b27b08328c [formerly 9e1b263569]]
Former-commit-id: cd51c7b044b380ed845833050ac954706860e142 [formerly a9b97bbd58]
Former-commit-id: 8487137803
2014-10-20 14:42:39 -05:00
Slav Korolev
2e67cc2d9f Omaha #3220 - Corrected area configuration managers for Fog, SAFESEAS and SNOW monitors.
Former-commit-id: c91e636d98 [formerly 1f4ed7fd1b] [formerly 9c369a9c5c] [formerly c91e636d98 [formerly 1f4ed7fd1b] [formerly 9c369a9c5c] [formerly 8971f40dc2 [formerly 9c369a9c5c [formerly 5fb653e5c7f7ffff1daf53487147597a569d7d11]]]]
Former-commit-id: 8971f40dc2
Former-commit-id: 042bf2b482 [formerly 19db4c34bb] [formerly 726de9ad3e8e7237b0a845990c102ba09fdadeed [formerly e517a73d81]]
Former-commit-id: 15e97a6a51d909c6ddad439e6a80921dbeecac9b [formerly de09cba07a]
Former-commit-id: 8a6f3b4749
2014-10-20 15:06:05 -04:00
Benjamin Phillippe
b4acac2eaa Omaha #3454 Upgrading to Hibernate 4.2.15
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29

Former-commit-id: af4f8e1c8a [formerly e6deeb6fb5] [formerly 7845e8e40f] [formerly af4f8e1c8a [formerly e6deeb6fb5] [formerly 7845e8e40f] [formerly fdd16051e8 [formerly 7845e8e40f [formerly 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5]]]]
Former-commit-id: fdd16051e8
Former-commit-id: c77edf49f8 [formerly a8ef477042] [formerly d7e89f87bfd941634f6cb4c75072b070108267c4 [formerly 5eec33b078]]
Former-commit-id: 62bf8f62e268a6361913c3567879ca0d71e2b3ef [formerly 3808c125b9]
Former-commit-id: 008b23be1e
2014-10-20 12:42:19 -05:00
Nate Jensen
f50fead470 Merge "Omaha #3598 Add original, unaltered grid scripts." into omaha_14.4.1
Former-commit-id: 7577c9479a [formerly 6cb997b25d] [formerly 887b47cda1] [formerly 7577c9479a [formerly 6cb997b25d] [formerly 887b47cda1] [formerly 9079801e98 [formerly 887b47cda1 [formerly 89d6e37d13413a7c8c8045c0c8d369e1cb61a2f4]]]]
Former-commit-id: 9079801e98
Former-commit-id: fa079e6066 [formerly 7c81792600] [formerly 163f8645d85bf1d653203d0ea348458c3e0ef8c8 [formerly 0ea89ff7bb]]
Former-commit-id: a4131f02139155a169fc67078def2ed18cd83e36 [formerly 836d7543f7]
Former-commit-id: 660dd0d428
2014-10-20 11:50:40 -05:00
Nate Jensen
84eddbd87e Merge "Omaha #3720 Remove dataURI from redbook plugin" into omaha_14.4.1
Former-commit-id: a03c5cb517 [formerly dd9f6fb257] [formerly 1245df2e0c] [formerly a03c5cb517 [formerly dd9f6fb257] [formerly 1245df2e0c] [formerly 401390dd9b [formerly 1245df2e0c [formerly 1435184cbc94eb9ee2ac97a5616566c421092805]]]]
Former-commit-id: 401390dd9b
Former-commit-id: a9c9f6a588 [formerly 168396211b] [formerly 7bf87b97c35923796478f77ec675c65dedb710b7 [formerly 54602afa68]]
Former-commit-id: 1323449be50c3ef36cad45d66536d24a9c0d7b56 [formerly 6477939d2d]
Former-commit-id: 3709881113
2014-10-20 11:45:50 -05:00
Nathan Bowler
05ab75687f Omaha #3598 Add original, unaltered grid scripts.
Change-Id: Ifed34ae4edb58e72cb0481ad90d3a7133a15554c

Former-commit-id: 4fa8385c03 [formerly c8fd3c154a] [formerly 1ae94e957b] [formerly 4fa8385c03 [formerly c8fd3c154a] [formerly 1ae94e957b] [formerly ee73c1e8cc [formerly 1ae94e957b [formerly fce70e6b0fcd5a2e905e49b95a4af60f52f9464d]]]]
Former-commit-id: ee73c1e8cc
Former-commit-id: 4ba33839ad [formerly 7d0ac44a7e] [formerly 2fd02e41b5a9db55bb2dfdf07383447771518e93 [formerly 936b1e7ea7]]
Former-commit-id: faa8e96b74e1de1ad9e47028ee23b3cbda621847 [formerly 6858d732e2]
Former-commit-id: 1b77a7ed9c
2014-10-20 11:18:35 -04:00
Nate Jensen
680947ab83 Merge "Omaha #3681 Allow satellite to be asynchronously interrogated." into omaha_14.4.1
Former-commit-id: 414011f0cb [formerly 4f93cf17ee] [formerly 1b628bdfa1] [formerly 414011f0cb [formerly 4f93cf17ee] [formerly 1b628bdfa1] [formerly 4946826d61 [formerly 1b628bdfa1 [formerly af0c30de9d7847feabc183f9bf84d07cab792320]]]]
Former-commit-id: 4946826d61
Former-commit-id: 82052a2d0d [formerly cca91a9714] [formerly b5ef59bb1a326a1dfc0ff5c68f380e49a7b48022 [formerly bbebc4487a]]
Former-commit-id: 220c96d2229b16c42a916d3143a35cf5d175fbbb [formerly 692155e51f]
Former-commit-id: 08066b2561
2014-10-20 09:34:57 -05:00
Ron Anderson
90f4a73be1 Merge "Omaha #3685 Checkin original A1 files sorted by key to aid in comparison with new files." into omaha_14.4.1
Former-commit-id: 126e2c566e [formerly eae4393aa5] [formerly 82a0b4bb9b] [formerly 126e2c566e [formerly eae4393aa5] [formerly 82a0b4bb9b] [formerly 1a01842639 [formerly 82a0b4bb9b [formerly 7a5b27db4a3be6dde7ff701b341124d9ed1a9ecd]]]]
Former-commit-id: 1a01842639
Former-commit-id: 378accc086 [formerly 37973d264e] [formerly 1cc1e69cfd6da5c5ef3f2a1723ede8e202a56eac [formerly e113d88477]]
Former-commit-id: 1b9dc5a226e33bd45035098b5c8fb47a296f752f [formerly ae5402fe97]
Former-commit-id: 5f246475bc
2014-10-16 18:44:38 -05:00
Ron Anderson
6489a98fbf Omaha #3685 Checkin original A1 files sorted by key to aid in comparison with new files.
Former-commit-id: 25a7f561e5 [formerly 734ca75957] [formerly 2fbf61748d] [formerly 25a7f561e5 [formerly 734ca75957] [formerly 2fbf61748d] [formerly 2781c4369b [formerly 2fbf61748d [formerly 09e39d4f85c8e853475b9f6059a748291e4d1bd7]]]]
Former-commit-id: 2781c4369b
Former-commit-id: ef8112ec74 [formerly 2ff4c96038] [formerly faff46793216816133ff70909ef79b35e980bf97 [formerly aa0749903b]]
Former-commit-id: 220a6b692325f75d35316108dbc6a9b9f67627be [formerly cb5846b2ab]
Former-commit-id: 77183528ae
2014-10-16 18:32:04 -05:00
Greg Armendariz
aa74261d02 Merge "Omaha #3299 fix xml attribute name" into omaha_14.4.1
Former-commit-id: 02307bd071 [formerly 8461e3075e] [formerly 6c09741587] [formerly 02307bd071 [formerly 8461e3075e] [formerly 6c09741587] [formerly aaa09c668a [formerly 6c09741587 [formerly 248f0585868ba5bfb2c514acde91d40f1684bfdf]]]]
Former-commit-id: aaa09c668a
Former-commit-id: 8268a6b756 [formerly 66d634e668] [formerly 41bf8c60c91752cffa59feb94beff647ad574c9e [formerly 974561952e]]
Former-commit-id: 0ee48219350c672aa1ea882963410c22927d1ae3 [formerly 8d0c8ac158]
Former-commit-id: 737d6e235c
2014-10-16 18:03:29 -05:00
Nate Jensen
1f850070c5 Omaha #3299 fix xml attribute name
Change-Id: I9f0878d9179be0b633e1635eff4d961359a82eb8

Former-commit-id: b60c67c62c [formerly 306485851f] [formerly cd5e4b9a08] [formerly b60c67c62c [formerly 306485851f] [formerly cd5e4b9a08] [formerly 73e15036de [formerly cd5e4b9a08 [formerly fa064accaafc2a4dedd8574eec6faf1960c8bc70]]]]
Former-commit-id: 73e15036de
Former-commit-id: 3a80417490 [formerly 2b6bd2cb0c] [formerly b0660bcfa3c65e6e6e45bd33f39566eb887732e2 [formerly 714d812e17]]
Former-commit-id: de7675cd5cf2af36f798fd44bd497a931c626468 [formerly 1caa1c9b7a]
Former-commit-id: e657d347e8
2014-10-16 17:11:26 -05:00
Nate Jensen
96a0f0bf09 Merge "Omaha #3709 Collaboration chat windows need to support changing foreground and background color" into omaha_14.4.1
Former-commit-id: 00073724f9 [formerly ccde01bd22] [formerly d3d6c9370d] [formerly 00073724f9 [formerly ccde01bd22] [formerly d3d6c9370d] [formerly 0c5f1c0f78 [formerly d3d6c9370d [formerly 7c37a9bd7e4fb16feace1d081d85a2b26d471338]]]]
Former-commit-id: 0c5f1c0f78
Former-commit-id: f75006d824 [formerly a73127bfe9] [formerly 57a1eba4690c2fb0115fa94e39762dc0e11039e0 [formerly edef0621f5]]
Former-commit-id: bdf1e3b447cded1b319ff5e689e3f880bd9e2f49 [formerly fe9206aec2]
Former-commit-id: 28302acec7
2014-10-16 10:48:06 -05:00
Mark Peters
a026cdaf38 Omaha #3709 Collaboration chat windows need to support changing foreground and background color
Change-Id: I1f208c3e12e0fe989ae395423ad28454be3589f7

Former-commit-id: 5a6f3ff09c [formerly ec62b9a6f1] [formerly 54a3e8d2eb] [formerly 5a6f3ff09c [formerly ec62b9a6f1] [formerly 54a3e8d2eb] [formerly e002132009 [formerly 54a3e8d2eb [formerly 8e00cd23205c4ab3f83c5594373f3736afe7fe83]]]]
Former-commit-id: e002132009
Former-commit-id: 7502a7d095 [formerly db58207c6d] [formerly e3b623b44a7ae728bf706820577b5598655114ce [formerly 5fc9bdec3b]]
Former-commit-id: d3c168634bee505091e42265b3383c4c55f4428e [formerly 4b8da0d859]
Former-commit-id: 91eedeee50
2014-10-16 10:28:34 -05:00
Nate Jensen
a7a3b5d86a Merge "Omaha #3730 export postprocessors package" into omaha_14.4.1
Former-commit-id: dc35445efb [formerly 0ce6914322] [formerly d5e5ba4103] [formerly dc35445efb [formerly 0ce6914322] [formerly d5e5ba4103] [formerly a1929bed50 [formerly d5e5ba4103 [formerly 7aaa064a36a6082ee5fe53c681ddfad0b4d4b87b]]]]
Former-commit-id: a1929bed50
Former-commit-id: 8bacbf86e7 [formerly 7182c3ef43] [formerly 3c68854afe321a29e446fbece170b1b4ec963f25 [formerly 2bb235437a]]
Former-commit-id: c6aca4f595eb0ff0d8d09557dd5d662691e251b4 [formerly 198b9b47c0]
Former-commit-id: 120b1238ca
2014-10-16 10:11:20 -05:00
Ben Steffensmeier
2f4a513b90 Omaha #3681 Allow satellite to be asynchronously interrogated.
Former-commit-id: 32f35bff96 [formerly ed00f845b3] [formerly 5292ea66a4] [formerly 32f35bff96 [formerly ed00f845b3] [formerly 5292ea66a4] [formerly ba4eeff346 [formerly 5292ea66a4 [formerly fbbb449f55668be653b15ff943cdc567cd1b662b]]]]
Former-commit-id: ba4eeff346
Former-commit-id: 12234576fc [formerly 42c4b742a1] [formerly 67fc740ef3ccfa29e0f88e8124e44dbdfbc6d105 [formerly e1707233c8]]
Former-commit-id: 1cb2c8d13a2d644c11a9dc6cbeca12f4d284030b [formerly aa21d42ada]
Former-commit-id: ac38f59d1f
2014-10-15 20:24:44 -05:00
Nate Jensen
d885ad8660 Omaha #3730 export postprocessors package
Change-Id: Ie87558540777c1cea7354b040e386ba67f835311

Former-commit-id: 31e5ac66b4 [formerly 2fc8887e08] [formerly 5dd168e76a] [formerly 31e5ac66b4 [formerly 2fc8887e08] [formerly 5dd168e76a] [formerly d5a5d55265 [formerly 5dd168e76a [formerly db613b63005c2763ca94851182042867aedd43c9]]]]
Former-commit-id: d5a5d55265
Former-commit-id: 3b0a34b064 [formerly 957e4c3b2c] [formerly 58badeb8d400a8c139ada6bae2ea87fc4b0870e3 [formerly 1f970283b5]]
Former-commit-id: 4ed4b400a1dce3b6bf748b080bd289f704316e47 [formerly 97b2b4c5b5]
Former-commit-id: 46226566e8
2014-10-15 14:46:12 -05:00
Greg Armendariz
349784b4b1 Merge "Omaha #3676 harden numpy array to java array conversions to work with newer versions of python/numpy and not crash when heap cannot be allocated" into omaha_14.4.1
Former-commit-id: a8ecc9e313 [formerly b62baa3b3b] [formerly bb418e47ed] [formerly a8ecc9e313 [formerly b62baa3b3b] [formerly bb418e47ed] [formerly 21042a8945 [formerly bb418e47ed [formerly 57052aea644edc471adc3961739e07d4dcf80197]]]]
Former-commit-id: 21042a8945
Former-commit-id: 92853f70c1 [formerly de3e203b58] [formerly 4facbe3ee880294271ccb93df46709ee5226bea6 [formerly 74086cdd1a]]
Former-commit-id: 1cc334f7eda55deb19d36141994b54bf9fd00106 [formerly 7f2f8378ba]
Former-commit-id: aa485787f5
2014-10-15 14:19:28 -05:00
Nate Jensen
af26acde6f Omaha #3676 harden numpy array to java array conversions to work with
newer versions of python/numpy and not crash when heap cannot be
allocated

Change-Id: I2a83f6e2720de331188ae5b42dd8c86b14900288

Former-commit-id: 08b6622cec [formerly 852fe79de3] [formerly 433e8b6fc1] [formerly 08b6622cec [formerly 852fe79de3] [formerly 433e8b6fc1] [formerly b23d42f561 [formerly 433e8b6fc1 [formerly 67630fce01ecbd64a760211820af5b5eaff4cade]]]]
Former-commit-id: b23d42f561
Former-commit-id: 66a1fd1d05 [formerly d2156230f3] [formerly fa936e390fcdb29318649dd9a0ff0d548d0a3b1d [formerly 0a42a053af]]
Former-commit-id: 130afdad1004a03879b993036570260a88d94700 [formerly 60b037dd49]
Former-commit-id: f82d929130
2014-10-15 09:02:07 -05:00
Steve Harris
728899ed0c Merge tag 'OB_14.3.1-26m' into omaha_14.4.1
Former-commit-id: 85d5b72d04 [formerly 4fde31539e] [formerly aff75d954b] [formerly 85d5b72d04 [formerly 4fde31539e] [formerly aff75d954b] [formerly f2fdf98d2f [formerly aff75d954b [formerly 4be51191bc64978e3c455702bede3456666fbffe]]]]
Former-commit-id: f2fdf98d2f
Former-commit-id: 2858cc538b [formerly f3017b859e] [formerly 2b876a6e0e17ef46bda5eb65707f10272b529e42 [formerly da238d6478]]
Former-commit-id: 97fce6689e379c3cd2d664d9ad9821a9d4ec910b [formerly 3f6bdf84c5]
Former-commit-id: 3954f6981f
2014-10-15 08:42:02 -05:00
Mark Peters
f1120afa09 Omaha #3720 Remove dataURI from redbook plugin
Change-Id: Iaeef7a259a51840fa51e1256ed8dc1c5b3df3a49

Former-commit-id: cb060fb534 [formerly 4a121ecbd5] [formerly 153cf12248] [formerly cb060fb534 [formerly 4a121ecbd5] [formerly 153cf12248] [formerly 06c9d6f7e9 [formerly 153cf12248 [formerly 5d3c2eb58fce655b25bf4db2a2045e9007ca58f8]]]]
Former-commit-id: 06c9d6f7e9
Former-commit-id: 47691d2749 [formerly 0cebb38b62] [formerly c97056985da43efce1ce20042920ddcd8dc4a570 [formerly d67a6327c0]]
Former-commit-id: 4d42f0334ed73804b0a94030bf010c983999ac60 [formerly a026684e07]
Former-commit-id: 1f13d8a2b9
2014-10-14 17:13:23 -05:00
Nate Jensen
28d8f006ef Merge "Omaha #3708 fixed possible NPE in SiteConfigurationManager" into omaha_14.4.1
Former-commit-id: 47326d08fe [formerly 30f1771008] [formerly 0105b3bacf] [formerly 47326d08fe [formerly 30f1771008] [formerly 0105b3bacf] [formerly 36049926a4 [formerly 0105b3bacf [formerly 876038997360dfef757f2864558de06e54fc8b45]]]]
Former-commit-id: 36049926a4
Former-commit-id: 1e83eebbb6 [formerly 490e4c7e05] [formerly a9046ec9c23b8cf14fd1779f46d3cd22898c9ab2 [formerly 8e2be367c0]]
Former-commit-id: f67a4c9aae4d300b34a75c652011406ac9144e23 [formerly ae7e088cfe]
Former-commit-id: fff9cd7719
2014-10-14 15:53:22 -05:00
Brian Clements
dbb499ca17 Omaha #3708 fixed possible NPE in SiteConfigurationManager
Change-Id: Ic63d25ed626bec38fea2374c4122d29b44e064ab

Former-commit-id: 847d9c9925 [formerly 158aa3f439] [formerly 180696a594] [formerly 847d9c9925 [formerly 158aa3f439] [formerly 180696a594] [formerly 0a42113bbb [formerly 180696a594 [formerly 21924a6b536409681073f65d769bef53db049102]]]]
Former-commit-id: 0a42113bbb
Former-commit-id: 016b7763e8 [formerly 5c1e35dc2e] [formerly 4ace24a1335d88e66758722a343dd206931cbc5d [formerly a555477f7f]]
Former-commit-id: e97dd8d4574e96113876fce9ea7291d8df9981fb [formerly bf26a69d82]
Former-commit-id: 5c756fa3f8
2014-10-14 15:49:36 -05:00
Mark Peters
c372e737ba Omaha #3722 Remove dataURI from taf plugin
Change-Id: I214772ee74989ab9f91423c2bad4ee7d58b3eba4

Former-commit-id: 6f82a7ecd9 [formerly d397d917c9] [formerly e7388847d6] [formerly 6f82a7ecd9 [formerly d397d917c9] [formerly e7388847d6] [formerly 708f961708 [formerly e7388847d6 [formerly 3a0cc08b25395cb168c8344c00fb17fb016aae36]]]]
Former-commit-id: 708f961708
Former-commit-id: 16db191a74 [formerly 64ec038793] [formerly 4324e0d4d905a5afd73c7957cff2b05b204ae4f7 [formerly 613423b7d4]]
Former-commit-id: 8062298e22f8a527389b01d5a8853c69483b57dd [formerly 0563436c65]
Former-commit-id: 76e4a0d7e9
2014-10-14 11:13:03 -05:00
Brian Clements
10956e859c Omaha #3675 startup shutdown log name includes child pid
fixed capture

Change-Id: Ifdd83f3f420bc50fd6d49a1ddaa2f83b20ab97f7

Former-commit-id: 3207d12d51 [formerly 78c2aa3650] [formerly 3a12ab9bdf] [formerly 3207d12d51 [formerly 78c2aa3650] [formerly 3a12ab9bdf] [formerly 6d6d3d26e6 [formerly 3a12ab9bdf [formerly 84a91d7b11790d4a37abc9b0a5c2d64952321b52]]]]
Former-commit-id: 6d6d3d26e6
Former-commit-id: 9a6cadddef [formerly d2042e3485] [formerly 48621bab7fab090a86fae6efa6712fd9419d4b52 [formerly 470a695a1a]]
Former-commit-id: 48bcd5641ac621600750d0346b7d8a2f58f7c784 [formerly cf3e570667]
Former-commit-id: 46845ee755
2014-10-13 16:32:41 -05:00
Richard Peter
9dd2d6522e Merge "Omaha #3675 cave.sh changes to ensure logfile pids match actual cave pid" into omaha_14.4.1
Former-commit-id: eb68a84c26 [formerly ef5fcfe852] [formerly d2909b6e08] [formerly eb68a84c26 [formerly ef5fcfe852] [formerly d2909b6e08] [formerly 360114be70 [formerly d2909b6e08 [formerly a7b644d5e831bc38f0442efc16f681fd5ff317d7]]]]
Former-commit-id: 360114be70
Former-commit-id: c96334f119 [formerly 7d16235944] [formerly ec399aa3cec1a79c1ac60a6c14f35c55bc21a53e [formerly f692cbf631]]
Former-commit-id: 294e5f864ee370d7611bab2b6ab2694474a5048d [formerly d5908e242a]
Former-commit-id: ee07857e4f
2014-10-13 12:37:28 -05:00
Brian Clements
129df50eee Omaha #3708 collaboration feed room supports blacklists
refactored SiteConfigurationManager

Change-Id: I74282074862674cac6b9190adafe38ed6d607dc5

Former-commit-id: 7d4dbd204e [formerly c33a5ad562] [formerly dfb43fda31] [formerly 7d4dbd204e [formerly c33a5ad562] [formerly dfb43fda31] [formerly 2a7feaebfe [formerly dfb43fda31 [formerly 9b2e76141b7cdd49c145d9d54f83e49ba3ea0d78]]]]
Former-commit-id: 2a7feaebfe
Former-commit-id: 844cd86c28 [formerly 4429a04d2c] [formerly f8802ed9ae8429e0853425985fe3dec6fe60d41d [formerly 38b4d2683c]]
Former-commit-id: ab77d717ac89ffff13f622ac601eb1c2169d0af0 [formerly 53a61c3230]
Former-commit-id: 258be9acb0
2014-10-13 11:11:32 -05:00
Nate Jensen
18d63be7ec Omaha #3675 cave.sh changes to ensure logfile pids match actual cave pid
Change-Id: Ibabf5e3f053c8796b70bb95de2459374891f7e59

Former-commit-id: 325a15e08f [formerly 5ae522c32a] [formerly b24faf99cd] [formerly 325a15e08f [formerly 5ae522c32a] [formerly b24faf99cd] [formerly 3eada560b7 [formerly b24faf99cd [formerly 12b8010ec08ec512a79d90b5ae3b3403acfa1c8c]]]]
Former-commit-id: 3eada560b7
Former-commit-id: 42b8cc19a1 [formerly 06a4cab622] [formerly 4d3864f439ff22df17470ff82898859a32ccc9e0 [formerly 26e9011f35]]
Former-commit-id: 30b2c101782c31faaa65ea59774ebdff9397595a [formerly 796db7518e]
Former-commit-id: 9acc1b0b57
2014-10-13 09:34:22 -05:00
Nate Jensen
6b9ddca8fd Merge "Omaha #3711 Allow configuration of how chat lines will display" into omaha_14.4.1
Former-commit-id: 0ad0f650b5 [formerly 3b54d07fa2] [formerly 190a85c872] [formerly 0ad0f650b5 [formerly 3b54d07fa2] [formerly 190a85c872] [formerly 8ccb625dc4 [formerly 190a85c872 [formerly f36afc27474267133b414d13951c271c5217f4dd]]]]
Former-commit-id: 8ccb625dc4
Former-commit-id: f049f66679 [formerly ec2064e610] [formerly 2db98a5b298dc3ae527994785f1f184c5fdf97fe [formerly 1efa1f1497]]
Former-commit-id: 3c67fb85df6bcb3238c7460cb4437e950527157b [formerly bd4b2a80bb]
Former-commit-id: a6ec34628e
2014-10-10 14:45:54 -05:00
Mark Peters
d71fcd6598 Omaha #3711 Allow configuration of how chat lines will display
Change-Id: Ibe66602c4e527a265be4ce9758652eaebdbe132f

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

Former-commit-id: 74275e8715 [formerly db82cdbdfe] [formerly 1df2418409] [formerly 74275e8715 [formerly db82cdbdfe] [formerly 1df2418409] [formerly 33e141dd38 [formerly 1df2418409 [formerly e1470cb4ce03b49ac85936760469a22786195a99]]]]
Former-commit-id: 33e141dd38
Former-commit-id: c9a5d45133 [formerly 0a267a8c22] [formerly c69ad51322f534045455456de9c265d350c51a6b [formerly 93b2dfc2c9]]
Former-commit-id: 69ba1fb4721a4c84598df9efc5de1052a6821fe8 [formerly 815d28aef9]
Former-commit-id: 0c28de9d2a
2014-10-10 13:20:04 -04:00
Brian.Dyke
9d5f5f4fa9 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 9d33c64bd2 [formerly a1de83a7a8] [formerly 862712a00f] [formerly 9d33c64bd2 [formerly a1de83a7a8] [formerly 862712a00f] [formerly 05e4e92e65 [formerly 862712a00f [formerly 4b2f00f3baeb6715ff76beb823978605742bc13d]]]]
Former-commit-id: 05e4e92e65
Former-commit-id: 13d4df30d8 [formerly c6a319c099] [formerly 0bc5f4a45d659f9cff64552d81e2736ab9d99de5 [formerly 748007cad1]]
Former-commit-id: 441d5fd9b8bb3e686f2b58d131c012e1a6414fef [formerly d618dac32b]
Former-commit-id: 901e7649d2
2014-10-10 13:17:54 -04:00
Shawn.Hooper
880c3ae6a8 ASM #13467 - GFE: Need to add Beach Hazards Statement
Change-Id: Icd52e8f1cd05f1f1ecd0b43458593e95496e0db6

Former-commit-id: 328b9f9d42 [formerly bfa9eb0dea] [formerly cea5061c61] [formerly 328b9f9d42 [formerly bfa9eb0dea] [formerly cea5061c61] [formerly 0c61661989 [formerly cea5061c61 [formerly 457c467d7437c5550bb8727e813d8aa9d9c338a9]]]]
Former-commit-id: 0c61661989
Former-commit-id: 3d985d75c4 [formerly 26c4187518] [formerly d7720efb9dc6f1a55837cf5028979a97b5edb77a [formerly c2acd70bc5]]
Former-commit-id: b0fcfbc2ec5df7c636cf408ac7fd0f7ec7bed678 [formerly 7d9fe08ca9]
Former-commit-id: aad1970cf0
2014-10-10 13:14:25 -04:00
Nate Jensen
38b6f4a6ce Merge "Omaha #3595 Fix sed call and man/sigw indices for proper comparison." into omaha_14.4.1
Former-commit-id: 0eb32c3d0c [formerly 404a87b2c9] [formerly 70561d721a] [formerly 0eb32c3d0c [formerly 404a87b2c9] [formerly 70561d721a] [formerly e7d524c06a [formerly 70561d721a [formerly bcc0d1c4f9516e90205d4c140ede99910d1af3b9]]]]
Former-commit-id: e7d524c06a
Former-commit-id: 597331c182 [formerly 32099edd46] [formerly e07bb5ca5e0215410177a81f6295ee434814b6e1 [formerly 93c71345ae]]
Former-commit-id: 5810e71d86b369a1424b08acf25151b2e4b3fae4 [formerly 6228516577]
Former-commit-id: 365acbdff8
2014-10-10 11:47:32 -05:00
Richard Peter
4b22a86fd5 Merge "Omaha #3718 Restored data delivery subscription backup web page" into omaha_14.4.1
Former-commit-id: 01eb1572dc [formerly f0243b5e5f] [formerly e7fbc0c012] [formerly 01eb1572dc [formerly f0243b5e5f] [formerly e7fbc0c012] [formerly b41be59fd6 [formerly e7fbc0c012 [formerly d3fa6c45ca179e5196af8078ae45ccb4a883804e]]]]
Former-commit-id: b41be59fd6
Former-commit-id: d7e45ede15 [formerly f725b827eb] [formerly af37c740a203cbe702ab7d1c5d9dfdf5682f0dd1 [formerly 421fb43d60]]
Former-commit-id: c67c0c2e931b66d28973c05bc91f0b2883230d28 [formerly 8f4e482678]
Former-commit-id: 47def22dd0
2014-10-10 11:13:12 -05:00
Nathan Bowler
5027682b48 Omaha #3595 Fix sed call and man/sigw indices for proper comparison.
Change-Id: Iee0ce15d06e2c84ac8bb4f5a3cf82a3c237222d2

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

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

Former-commit-id: 544b2f9fbc [formerly 5e5256fca1] [formerly 104b47daa2] [formerly 544b2f9fbc [formerly 5e5256fca1] [formerly 104b47daa2] [formerly 4241eab8ac [formerly 104b47daa2 [formerly d6793fc17662a0ea0d5814524f4e641e1524ebde]]]]
Former-commit-id: 4241eab8ac
Former-commit-id: 15b53bfdea [formerly 939e8a4736] [formerly 3de4554ead51c602dafcca7b1824049f3402c073 [formerly aa36802cdf]]
Former-commit-id: 75f7dcfdf94642ea6815ee21fcb23c29f72bedc6 [formerly 0f5499d93c]
Former-commit-id: e343c017fb
2014-10-10 11:33:07 -04:00
Brian.Dyke
03f65ca414 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 2e6f3e057a [formerly 797a9c6c10] [formerly f85eb2d0ac] [formerly 2e6f3e057a [formerly 797a9c6c10] [formerly f85eb2d0ac] [formerly 6ae3795b7c [formerly f85eb2d0ac [formerly 344f436cfabfa5c1d0aa552467be7a6f9656a1ec]]]]
Former-commit-id: 6ae3795b7c
Former-commit-id: 4962750f7e [formerly 6034909d2d] [formerly b9b756a1fb303b55472d87a26e19fc89a60a9ac7 [formerly 36571c8238]]
Former-commit-id: 4dee77ada5e45267109cee2b90e6dc3c62342602 [formerly 969b40b517]
Former-commit-id: fdfc95c5ff
2014-10-10 11:01:01 -04:00
Nate Jensen
92e3be5998 Omaha #3549 remove unnecessary @Column annotations from TextRecord
Change-Id: I5f36baf0c7b697782379bef0dd5c28d8cb60e77e

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

Former-commit-id: 94364ab115 [formerly c20d19a2d3] [formerly cf1bff0d02] [formerly 94364ab115 [formerly c20d19a2d3] [formerly cf1bff0d02] [formerly 6bb4f5dbdf [formerly cf1bff0d02 [formerly 3eaa3fa11068cbf6d1a58d4eb414f52f243bbaea]]]]
Former-commit-id: 6bb4f5dbdf
Former-commit-id: ed61a1a3a8 [formerly 95a34bd053] [formerly bab42edcd9b274b3abc3f6b16f3cfd76ddf324dc [formerly 5b5fac85b8]]
Former-commit-id: ed09793cc93fee4c1805bf02118b29ade7b0bf80 [formerly c3665bccd9]
Former-commit-id: c906433c99
2014-10-09 15:30:23 -05:00