Commit graph

3218 commits

Author SHA1 Message Date
Ron Anderson
0b5a69e72c Merge "Issue #2348 Fix leak of D2DGridDatabase objects." into omaha_13.5.1.1
Former-commit-id: b18417e9c8 [formerly e6c5b29c9d] [formerly 83574f2fff] [formerly b18417e9c8 [formerly e6c5b29c9d] [formerly 83574f2fff] [formerly 9f222b38df [formerly 83574f2fff [formerly b0261b95da14e9d783e57fd4270c9fff646b3b82]]]]
Former-commit-id: 9f222b38df
Former-commit-id: bf1ddc1ff1 [formerly 579c8323e5] [formerly c92ad9cf01b9837fe94e71ff90780001501cd087 [formerly 2f8a4e0078]]
Former-commit-id: 548ccbca3d240f735e694a06f07dad73ff3ef2c8 [formerly c7558575a6]
Former-commit-id: 730729219d
2013-09-17 08:36:12 -05:00
Bryan Kowal
7fb8474ef2 Issue #2368 - restore yajsw-wrapped qpid changes to 13.5.1.1
Former-commit-id: 99ac59a375 [formerly d751cdf6be] [formerly 8955c3a9d4] [formerly 99ac59a375 [formerly d751cdf6be] [formerly 8955c3a9d4] [formerly bb6db1ee7b [formerly 8955c3a9d4 [formerly b8f277fb13562bf0c7d07700940f75074db1f93b]]]]
Former-commit-id: bb6db1ee7b
Former-commit-id: 83b921c18a [formerly c665d4345b] [formerly 6b095ce2fa9a883b65db62b7b104ca495a9b5714 [formerly 45f92de475]]
Former-commit-id: 6f94341760c00f0d50c02b966243f05c01558d28 [formerly 9cdab1a257]
Former-commit-id: 677004bbe5
2013-09-16 17:05:17 -05:00
Ron Anderson
884d2b5cc7 Issue #2348 Fix leak of D2DGridDatabase objects.
Change-Id: Iaaf50d74798126335d114638b8ef2be88cf42a5d

Former-commit-id: 8598bf5eb2 [formerly 1c2da29a4d] [formerly 60320a0f28] [formerly 8598bf5eb2 [formerly 1c2da29a4d] [formerly 60320a0f28] [formerly 260a9ed866 [formerly 60320a0f28 [formerly e8ffd704cfccc7cd5f4a8298a488c3ac7d8c428d]]]]
Former-commit-id: 260a9ed866
Former-commit-id: e536d5f0aa [formerly 163eb55f0f] [formerly 4585b6cefb5c0d9b659b663054223df7905d972f [formerly e779f148b4]]
Former-commit-id: 0198873d30e2e502bf9df4649bc0103319eac10a [formerly 6828fecf70]
Former-commit-id: 23b2248877
2013-09-16 16:34:12 -05:00
Bryan Kowal
88b1021cef Issue #2368 - apply java qpid patch
Former-commit-id: f553e47d72 [formerly 4c2871a59b] [formerly 164598e584] [formerly f553e47d72 [formerly 4c2871a59b] [formerly 164598e584] [formerly d6eca92d11 [formerly 164598e584 [formerly 1f29b62624650652a4a1b347dfd70fc161be0f5e]]]]
Former-commit-id: d6eca92d11
Former-commit-id: 3a5cef8408 [formerly 7caaa4f69e] [formerly b52639346631a7a70733559ff68869c1c864702f [formerly 170e1d40e4]]
Former-commit-id: bc51528d7c985a829ff230afe0f2c8aa59413c5d [formerly a44c9bd535]
Former-commit-id: 241e443df8
2013-09-16 16:15:50 -05:00
Nate Jensen
2afb8264e9 Merge "Issue #2249 Changes to get simulated time from warngen ingest files." into omaha_13.5.3
Former-commit-id: 86ecc443b8 [formerly 9c6071c0fa] [formerly f727434ae8] [formerly 86ecc443b8 [formerly 9c6071c0fa] [formerly f727434ae8] [formerly 5e7221efe8 [formerly f727434ae8 [formerly 892a39d7fe4f328b7d09fb8d44cdfadef48ca3c7]]]]
Former-commit-id: 5e7221efe8
Former-commit-id: 4308f3079a [formerly 312db0fffd] [formerly 37446019a3103c21d0ebb9b6f3f9b494193929df [formerly 024afbe712]]
Former-commit-id: 22627bc70ba57c93ed025e28951ced1e14850c9a [formerly 5cc048fb7d]
Former-commit-id: fa90c2bcb2
2013-09-16 14:37:14 -05:00
Roger Ferrel
7ba2559fef Issue #2249 change to data deliver feature.xml to get compress.
Change-Id: I0c22609730907d0037f438a2834b37730efa59fe

Former-commit-id: ed5bcc31dd [formerly bfde6129bd] [formerly dc13af26b5] [formerly ed5bcc31dd [formerly bfde6129bd] [formerly dc13af26b5] [formerly 9c63dc2cbb [formerly dc13af26b5 [formerly ff6b35dab643add82563ce9f2e36fed0b09ef965]]]]
Former-commit-id: 9c63dc2cbb
Former-commit-id: 21c374fa99 [formerly 6405b9606b] [formerly b8235991ce2a9ff8faa7ae2977520534d3cf9578 [formerly 60ef8a0420]]
Former-commit-id: c236b073ab11562d889cec005547d0ba3c959f04 [formerly 9c19f09039]
Former-commit-id: f9fb66ab82
2013-09-16 14:14:17 -05:00
Nate Jensen
3cdc6d5792 Merge "Issue #2368: Update JMS routing to set message persistence and durability at the config level" into omaha_13.5.1.1
Former-commit-id: a8b89fb284 [formerly 5ce20bb2a3] [formerly 7568a0f361] [formerly a8b89fb284 [formerly 5ce20bb2a3] [formerly 7568a0f361] [formerly 6443fd555b [formerly 7568a0f361 [formerly 27c515f42619fd054874c82ee8a99637f7918449]]]]
Former-commit-id: 6443fd555b
Former-commit-id: 9ff6444ef5 [formerly 818e604d3d] [formerly 948f15f5ab7907b7acd2ac7a90eb8699f22aece7 [formerly 8ca20735c7]]
Former-commit-id: 506ce18ffb8b01af7b98ca2a916c2159bf33cd8f [formerly c421fd6b46]
Former-commit-id: 2fc7e5edee
2013-09-16 11:26:42 -05:00
Steve Harris
16ff8c55f7 Merge branch 'master_13.5.2' (13.5.2-5) into omaha_13.5.2
Former-commit-id: 974f328820 [formerly ae10695a27] [formerly 4bd09261ee] [formerly 974f328820 [formerly ae10695a27] [formerly 4bd09261ee] [formerly 3aa91aa5c7 [formerly 4bd09261ee [formerly 7da2eecc2d0143bb46b91ef3f9c38070044db99b]]]]
Former-commit-id: 3aa91aa5c7
Former-commit-id: dc95289811 [formerly a33e660c6b] [formerly 5d1ba0a447208aa6e587540a0866589d612db9ae [formerly 017b5388d0]]
Former-commit-id: ae875ed2225d310d212a670e91ae4fe32b83c6a3 [formerly c25e81351d]
Former-commit-id: 0b00f06e20
2013-09-16 09:27:00 -05:00
Steve Harris
4a8c88bbc3 Merge branch 'master_13.5.1.1' into omaha_13.5.1.1
Former-commit-id: e4be091421 [formerly 278c91ea2d] [formerly fd83e1da11] [formerly e4be091421 [formerly 278c91ea2d] [formerly fd83e1da11] [formerly 2915c6393d [formerly fd83e1da11 [formerly a419d477ab3d6d03958e1f3960eac2b428766848]]]]
Former-commit-id: 2915c6393d
Former-commit-id: 2c4484c541 [formerly 9270e14a67] [formerly 92ae24a25fea6405ba635de544166e29155aafe6 [formerly dcc0c7e0ae]]
Former-commit-id: a443b11f4d1177142abf66d14149552e83b32ef7 [formerly be279f4d36]
Former-commit-id: beb995f6b3
2013-09-16 09:24:25 -05:00
Steve Harris
bbbcc661b7 13.5.2-5 baseline
Former-commit-id: dc60765dcb [formerly 31111f4f52] [formerly 0745317d53] [formerly dc60765dcb [formerly 31111f4f52] [formerly 0745317d53] [formerly 67cceefe5d [formerly 0745317d53 [formerly ed50e9426fd099fd9336b7bfc8d0c5c35f8500f4]]]]
Former-commit-id: 67cceefe5d
Former-commit-id: 4c4dd59711 [formerly c8ead44672] [formerly 738f26259951c00c72cc70df42f55b887349b3ef [formerly 6202bacae1]]
Former-commit-id: e26890a39b824d77b4f4c3c0acd1eed489865f1e [formerly c79546c83a]
Former-commit-id: fb70a4b4b0
2013-09-16 10:14:25 -04:00
Steve Harris
6d638e47bc 13.5.1.1-2 baseline
Former-commit-id: a5504150bc [formerly db270db3cb] [formerly 4fa273439f] [formerly a5504150bc [formerly db270db3cb] [formerly 4fa273439f] [formerly e19db57fe6 [formerly 4fa273439f [formerly 9638b9e92c2d271cb804d32daba114c063aeb7f5]]]]
Former-commit-id: e19db57fe6
Former-commit-id: 929b982f24 [formerly 41d7784ee6] [formerly a85392fb47e1e594c8076e87e78451ace76cb77a [formerly 11369e2753]]
Former-commit-id: ccc0bf173ca506db086962b45bfa349bb7d22be1 [formerly 6a9a4a0fcf]
Former-commit-id: 38d25fada6
2013-09-16 10:02:04 -04:00
Richard Peter
d38773fc03 Issue #2368: Update JMS routing to set message persistence and durability at the config level
Former-commit-id: 449692aeff [formerly b803359eb4] [formerly 5111debc92] [formerly 449692aeff [formerly b803359eb4] [formerly 5111debc92] [formerly a5a7816b98 [formerly 5111debc92 [formerly 9ac3d2ddbeee7265b9b7879fcc6efcee95281872]]]]
Former-commit-id: a5a7816b98
Former-commit-id: 21fb70a26a [formerly db69f5b54a] [formerly 30f0c6a3141bbd70f57d9187f7478aa7a8aecd56 [formerly bc169f0a04]]
Former-commit-id: 4a8c427f1c11daaee6646c7b4ca27cb08a82416c [formerly 7fe0220024]
Former-commit-id: 4effeb83ba
2013-09-15 13:44:17 -05:00
Bryan Kowal
e5fbcc1a09 Issue #2133 - qpid is now a wrapped java application; incremented qpid release
- Amend: wes2bridge compatibility updates
- Amend: running deploy.xml in the yajsw project will now deploy it to both its EDEX and QPID destination
- Amend: fixed monitoring in qpid wrapper.conf
- Amend: no longer restart qpid when >= 90% of the heap is used
- Amend: specify maximum memory directly in wrapper.conf

Change-Id: I2e3e6881f456535bac08f51f1e541e708be20f58

Former-commit-id: 1ff8ab2db2 [formerly 1d0e58f85d] [formerly d322c993c0] [formerly 1ff8ab2db2 [formerly 1d0e58f85d] [formerly d322c993c0] [formerly f1cfc60a93 [formerly d322c993c0 [formerly 0a8dd30dc1937287561d7ae8a3073137d100fe4f]]]]
Former-commit-id: f1cfc60a93
Former-commit-id: 2e921da8c0 [formerly 2ed95acce0] [formerly 0c09d4dd62d00cd7ab7654c3ae16063225321219 [formerly aae9f35b39]]
Former-commit-id: 2b3058af237ed12c5aa1650ace786259842b5e19 [formerly ddd1e47e38]
Former-commit-id: ffa598d3f9
2013-09-13 10:03:08 -05:00
Roger Ferrel
b2d087307c Issue #2249 Changes to get simulated time from warngen ingest files.
Change-Id: Ib66d7eb678a29109ee1dd4328081e4f0d622af14

Former-commit-id: 4e976ef155 [formerly 2afd3523a4] [formerly 46011b2b52] [formerly 4e976ef155 [formerly 2afd3523a4] [formerly 46011b2b52] [formerly 6470b5d1ee [formerly 46011b2b52 [formerly 45a70809cc891d2abb3e8587f0640669e579f351]]]]
Former-commit-id: 6470b5d1ee
Former-commit-id: de55b28e17 [formerly 772d7644b3] [formerly 206d50895dc75dac28bd375b6b0a40894ab91a8e [formerly 372ab9e533]]
Former-commit-id: b0a2ea02172fad1c1880db196cb27668db4e9b5e [formerly 1e1ba0b872]
Former-commit-id: a80f58102c
2013-09-12 14:59:49 -05:00
Richard Peter
15e96a9994 Issue #2362: Merge issues with initial cherry pick of Wes2Bridge DRs
Former-commit-id: df374f45aa [formerly a0d6ce6dbb] [formerly 4b6e4fcd3a] [formerly df374f45aa [formerly a0d6ce6dbb] [formerly 4b6e4fcd3a] [formerly da4faa645d [formerly 4b6e4fcd3a [formerly 89a61850616dd532fc81e7cdaefc9dcb360633f3]]]]
Former-commit-id: da4faa645d
Former-commit-id: 8279a8620d [formerly f262ec5ea8] [formerly 4265992ba4d533326336d2d9c8fb6ab8365193d2 [formerly deddf5cc1f]]
Former-commit-id: e66954987492e44f0694ce9475b35ba7841bd054 [formerly 5a12a9ff69]
Former-commit-id: f8041d0fba
2013-09-12 13:47:43 -05:00
Richard Peter
4f12c51144 Issue #2298: Fix DataURIUtil calling setPluginName
Change-Id: Ic0ee254bcd61bad9a76179486b11ff15bff2d271

Former-commit-id: 8a398f11ad [formerly bd94793415] [formerly 75d2cd017e] [formerly 8a398f11ad [formerly bd94793415] [formerly 75d2cd017e] [formerly b0b544bcec [formerly 75d2cd017e [formerly 859fe815193d65c35c1c753153f8d93767abf414]]]]
Former-commit-id: b0b544bcec
Former-commit-id: 9c35ab2449 [formerly 52bef6ad53] [formerly 03c722db879213db05890636220da9df203f0822 [formerly 0d133c3b26]]
Former-commit-id: 0aed685a00104009c21348a890e07566828d91b3 [formerly e26d96b3ec]
Former-commit-id: ee444c119c
2013-09-12 12:49:36 -05:00
Richard Peter
2c7bd50390 Issue #2298: Remove setPluginName python calls.
Former-commit-id: 3e5a619134 [formerly 7d1cf6881e] [formerly 6b93f9ad06] [formerly 3e5a619134 [formerly 7d1cf6881e] [formerly 6b93f9ad06] [formerly 799fe37bca [formerly 6b93f9ad06 [formerly b666f99d3dc79b90525177072e2448077c39545a]]]]
Former-commit-id: 799fe37bca
Former-commit-id: 613bae7e58 [formerly ebd65eb24f] [formerly 674eec92387987ea077a8e65c63680244c9df5fb [formerly 8c9e5f214b]]
Former-commit-id: dcfbbe8ee2f522207c4df7b1cc6514d6b74b18b9 [formerly 55616d1343]
Former-commit-id: a2af133db0
2013-09-12 12:49:23 -05:00
Roger Ferrel
c1fe34415b Issue #2224 Add enable flag to archive purger and move properties to plug-in.
Change-Id: I6fd80f4b5f1326a173bd8e980735781d9ec03898

Former-commit-id: 0685560166 [formerly ea812e4932] [formerly af1be4b9a4] [formerly 0685560166 [formerly ea812e4932] [formerly af1be4b9a4] [formerly dcfc88a94a [formerly af1be4b9a4 [formerly b48e7521377834d9301ca058893f2a5293cc8d74]]]]
Former-commit-id: dcfc88a94a
Former-commit-id: e25d84d015 [formerly a2a7c78d88] [formerly fa7e54ee39374861cf2751d092586f1a73c07a1a [formerly a2222ad404]]
Former-commit-id: 19c1ab60e5f4d49bc6c7ed909a441962de4b5df3 [formerly 029f2e28b8]
Former-commit-id: 200c0ffb2e
2013-09-12 12:49:10 -05:00
Richard Peter
2b02cee6ff Issue #2298: Make getPluginName abstract
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae

Former-commit-id: 04c64843dd [formerly feeddb503f] [formerly 41550aaf9f] [formerly 04c64843dd [formerly feeddb503f] [formerly 41550aaf9f] [formerly 80e7b265dd [formerly 41550aaf9f [formerly 0f939c3d1f89bf3463315528c1b47f5f49e2fa05]]]]
Former-commit-id: 80e7b265dd
Former-commit-id: ebd1861dbf [formerly 744320a0ff] [formerly 8730e09117da72755c56a49d5b1957697ffdfe1d [formerly 917a2d153f]]
Former-commit-id: 5f8e897b4442bda1ab2cda9997dabe889ab3b83b [formerly 45f84d6889]
Former-commit-id: da668e7cc9
2013-09-12 12:48:36 -05:00
Roger Ferrel
cd1087ad76 Issue #2224 Unit test now handles different time types and configuation changes.
Change-Id: I7f082b55ae112b1835ebdb516da85b2267e546e7

Former-commit-id: 56a36ae7a6 [formerly a3b5774a41] [formerly c565c6e6be] [formerly 56a36ae7a6 [formerly a3b5774a41] [formerly c565c6e6be] [formerly 633baeb268 [formerly c565c6e6be [formerly a88d522a58297f399f2100195c01cf4c54b1f508]]]]
Former-commit-id: 633baeb268
Former-commit-id: 00d93b372f [formerly 43f09e1e2b] [formerly c25cdc7dd2dfc330008aff53e33c562c8a9e51f8 [formerly 0d3dbaf89b]]
Former-commit-id: f27b252eaacf8307e3b3949ba4d2e417042fe25d [formerly fae2c26c47]
Former-commit-id: 6995613915
2013-09-12 11:50:23 -05:00
Roger Ferrel
2f9e3c8a60 Issue #2299 fixed purger running ingest out of memory.
Change-Id: If1877049574fd546e90479f3c56feb94ffbe088a

Former-commit-id: e3bd59c39c [formerly 7d9afba0db] [formerly 1d71cf8beb] [formerly e3bd59c39c [formerly 7d9afba0db] [formerly 1d71cf8beb] [formerly 79d8c93563 [formerly 1d71cf8beb [formerly f75af60ec46f734bd5e815eeeab2bc82d3436229]]]]
Former-commit-id: 79d8c93563
Former-commit-id: faf9adb163 [formerly 94e5a0eec0] [formerly f5546f55ebd95b61923296a16ca36cc6351a85f0 [formerly 01b99b17a2]]
Former-commit-id: 44b77b35377df3f723ab19dcc55490379c504f3f [formerly 5b5b2005e6]
Former-commit-id: f4e99b457a
2013-09-12 11:50:02 -05:00
Roger Ferrel
0d7c47fbf5 Issue #2225 Disabled multi file compress check box.
Change-Id: I58437e753a4b5d63088c0e7e20b92b87e024d7d3

Former-commit-id: cdbdcc64f7 [formerly 1467971c86] [formerly 1663d86af4] [formerly cdbdcc64f7 [formerly 1467971c86] [formerly 1663d86af4] [formerly c04739ade2 [formerly 1663d86af4 [formerly 0d59b0dc1d12db0aec2624532613fd28a68d4683]]]]
Former-commit-id: c04739ade2
Former-commit-id: a71437b459 [formerly 64290ed87c] [formerly 497debe18bd117d75711c0a2f50c2d4ff0a4f7b2 [formerly ca78bb0528]]
Former-commit-id: 38c3f2dbf641e9fb107c0cf7803841bd13aac02e [formerly 09b881d1fc]
Former-commit-id: ca721b28eb
2013-09-12 11:47:48 -05:00
Roger Ferrel
0ecfca5b4d Issue #2225 Remove java 1.7 constructor.
Change-Id: Ic3c3097cfef71db92fdc4550ee7d4f4c505aeac6

Former-commit-id: 33a82a6f0b [formerly 78ef67bc8e] [formerly e26897c982] [formerly 33a82a6f0b [formerly 78ef67bc8e] [formerly e26897c982] [formerly 697f2ddab9 [formerly e26897c982 [formerly 8126af830791b426f65ffe667caa8ea092a19383]]]]
Former-commit-id: 697f2ddab9
Former-commit-id: cd37ae34e3 [formerly e57670383d] [formerly 12bc880237a4f1c695e37522b014018d8f06e12f [formerly 3081b07fb4]]
Former-commit-id: 7067689872e158ba587884ead54cf2efb190000e [formerly 3b2c2db330]
Former-commit-id: a4a96830ed
2013-09-12 11:47:37 -05:00
Roger Ferrel
80b9585919 Issue #2225 Changes for make tar compressed files.
Change-Id: I154683fec10b57d548944dd9037d4ca61cbe1b1b

Former-commit-id: 08c52159eb [formerly 24729e66c6] [formerly 48ae3b65f4] [formerly 08c52159eb [formerly 24729e66c6] [formerly 48ae3b65f4] [formerly a73ee97bb5 [formerly 48ae3b65f4 [formerly 70584120f397f3087d35f908744d45a44c8b27ba]]]]
Former-commit-id: a73ee97bb5
Former-commit-id: 02aa5f3054 [formerly 0b1dd822ca] [formerly cbb0179d268923d1c289c52a57b611758ce42a47 [formerly fee4ea45e5]]
Former-commit-id: e48cef3be35c3ea993d68b239afd9354635d7ae4 [formerly 1ca2c937c4]
Former-commit-id: d22e68a2d3
2013-09-12 11:46:06 -05:00
Roger Ferrel
c97f4303be Issue #2220 Better response using priority queues and delay getting display data.
Change-Id: I5f7b8eb904dcde9ef52acc2f39df864ac62080bb

Former-commit-id: c9ee082664 [formerly 486169feb6] [formerly 76a6afc46f] [formerly c9ee082664 [formerly 486169feb6] [formerly 76a6afc46f] [formerly 7879979110 [formerly 76a6afc46f [formerly f6f5a236056e2d3cbbcd2fdb3a1efa1c76ef5178]]]]
Former-commit-id: 7879979110
Former-commit-id: 4523f84ade [formerly 6b0635b424] [formerly 6bfe4ef89cd98d06bec9b081c94a8a7c39730cff [formerly 451a11aa58]]
Former-commit-id: 5d50a614fc7b966528459ca7e22a3867378ec8f3 [formerly 9b21d8876a]
Former-commit-id: f8f435d30a
2013-09-12 11:42:36 -05:00
Roger Ferrel
cc2252463f Issue #2224 Bug fixes to pass unit test.
Change-Id: I6f1c5721afaab21ade5a7f780ba92ca7b4ea8a00

Former-commit-id: 4ad10dd3c8 [formerly 8da461743f] [formerly 3569155bc0] [formerly 4ad10dd3c8 [formerly 8da461743f] [formerly 3569155bc0] [formerly ac538a0476 [formerly 3569155bc0 [formerly 3a7e798e473e90de6fe4e6f50c645ecce5a37c51]]]]
Former-commit-id: ac538a0476
Former-commit-id: 78b3872882 [formerly 5d3f410f14] [formerly d06f670064335340c28b4e06adde6c367c8e30ed [formerly d7db78d9e8]]
Former-commit-id: 9d3381f067de956cad112cf6bfded17a105d82d6 [formerly c491057767]
Former-commit-id: 8774a89457
2013-09-12 11:42:26 -05:00
Roger Ferrel
e244126c78 Issue #2224 Quick for daily build until I figure out what is really wrong.
Change-Id: I589b04aae265239dc2cb2e34819ff28eb2ced8d6

Former-commit-id: 4037d95b1c [formerly 8838576ba6] [formerly 9b36f64e4d] [formerly 4037d95b1c [formerly 8838576ba6] [formerly 9b36f64e4d] [formerly 4ec979ee51 [formerly 9b36f64e4d [formerly 6f9923ff706eb7997c112707214f4a6f351923c9]]]]
Former-commit-id: 4ec979ee51
Former-commit-id: f5da90120a [formerly a9f796c7ac] [formerly cc873a28195b7fc4c293e087a932fab3f708b7b3 [formerly 08e8f3a353]]
Former-commit-id: 5e466f5e93d5c9a98e9c02493036bd55d5902cac [formerly 5a678041cf]
Former-commit-id: 021dae9632
2013-09-12 11:42:15 -05:00
Roger Ferrel
6c24b9ba0c Issue #2224 Changes to have DataSet in configuration.
Change-Id: If626c4ef5b1da5bf5b6c660a0337009620a04db8

Former-commit-id: cdc5ef03cc [formerly 4e9a6a73e3] [formerly 8110b6f450] [formerly cdc5ef03cc [formerly 4e9a6a73e3] [formerly 8110b6f450] [formerly ecef7234a5 [formerly 8110b6f450 [formerly 80b773eecdce3d80e35262f04d56f6ae37d369bb]]]]
Former-commit-id: ecef7234a5
Former-commit-id: c11713b2cb [formerly c32aac47b1] [formerly d7dd55f30e9686165356faedf415e08abb78ebf9 [formerly a08b099e8c]]
Former-commit-id: a77450658aeaa0338f9ac0d32e11a887cf69f408 [formerly beb3b0229e]
Former-commit-id: cc01c09e03
2013-09-12 11:42:03 -05:00
Roger Ferrel
49c17e25ea Issue #2222 Changes to allow display of all selected data.
Change-Id: I1594f7f3cf888a3de7e6458e5e225eaa4d337adb

Former-commit-id: a9a7465969 [formerly cd90096d54] [formerly 6bf67dd7f5] [formerly a9a7465969 [formerly cd90096d54] [formerly 6bf67dd7f5] [formerly ad634081ae [formerly 6bf67dd7f5 [formerly e7b7d4c4507ebc32bde3007d04d93c5808cf6d2f]]]]
Former-commit-id: ad634081ae
Former-commit-id: bee3bce330 [formerly 63934b011a] [formerly 8040e3d94128742ea874540abcc13007bb0a70e5 [formerly 47169f4d1d]]
Former-commit-id: 400957e99c583c6e641737bb77fcf8aedc965d7a [formerly 94d1be8423]
Former-commit-id: 409dba419d
2013-09-12 11:41:48 -05:00
Roger Ferrel
3c6ef4432a Issue #2221 - Changes to have select configuration files for retention and case creation.
Change-Id: Ia24898f04c3a2a626ea0aeb04c2c302e406afa1f

Former-commit-id: 458a16bbbe [formerly 6f2c8da31a] [formerly cd848ded29] [formerly 458a16bbbe [formerly 6f2c8da31a] [formerly cd848ded29] [formerly 6694f17f42 [formerly cd848ded29 [formerly 303a5b6dada429257e00b4059c8846a2d97a85de]]]]
Former-commit-id: 6694f17f42
Former-commit-id: a82e39fb0f [formerly 3dc47deabf] [formerly b70cc7deb142daf687f5075c287c8a1e284f818f [formerly 07ea33c123]]
Former-commit-id: f988e47879324278765a89a9e766b85ab98e0f0d [formerly 81e029489b]
Former-commit-id: 914d384379
2013-09-12 11:41:35 -05:00
Roger Ferrel
623268de70 Issue #2220 Removed synchronized from most methods.
Change-Id: I863fd9017e53212b1cdf926ae32a163e2d327858

Former-commit-id: 4495727654 [formerly 0a63b743b2] [formerly d44f5b3b8a] [formerly 4495727654 [formerly 0a63b743b2] [formerly d44f5b3b8a] [formerly 1410a55293 [formerly d44f5b3b8a [formerly e212ffad7d0451caa7192561a7c41aec1d5987c9]]]]
Former-commit-id: 1410a55293
Former-commit-id: ecd8973bdf [formerly 155df8b7fb] [formerly 4e1e26924756cde58f725b8ade9442161ed4a9f1 [formerly 2d81476221]]
Former-commit-id: 338e9e9cc54e746b31abc0c30f5ac09fff9d1c0b [formerly 166755b524]
Former-commit-id: 09a2f977a5
2013-09-12 11:41:22 -05:00
Roger Ferrel
93e2acf427 Issue #2220 Implement Archive GUI's recompute sizes.
Change-Id: Ib80dadc33762a155d5b48bd9ae2e7cf5273f01ea

Former-commit-id: 39701a4836 [formerly d47816f5a0] [formerly 34ba55485d] [formerly 39701a4836 [formerly d47816f5a0] [formerly 34ba55485d] [formerly 01ca37d574 [formerly 34ba55485d [formerly 0091d8e60a9d1b5eb16326ab27ae1de53f1bac9a]]]]
Former-commit-id: 01ca37d574
Former-commit-id: e58c7ed737 [formerly 232e097d7c] [formerly 16f579d3ccc4b66804c3c1befebe2545fc5c84a6 [formerly 0b7bf83d00]]
Former-commit-id: 8ad2ab30a82c745b68f080d9a3352f4f9635beb2 [formerly 99d7080a78]
Former-commit-id: 68dcfcd14f
2013-09-12 11:41:06 -05:00
Roger Ferrel
2aa41319ce Issue #2216 Removetime stamp filer when copying to a hdf5 file.
Change-Id: Ib3ff230e410a73ea63c5d5f5dc2a27efa663921f

Former-commit-id: be52979c8c [formerly 1978a71986] [formerly e0ebe8fa37] [formerly be52979c8c [formerly 1978a71986] [formerly e0ebe8fa37] [formerly 96092b3ea8 [formerly e0ebe8fa37 [formerly c8a179b6e7962ff2ac5aa05a31e745c2c2e63ef3]]]]
Former-commit-id: 96092b3ea8
Former-commit-id: e35c1f793c [formerly 552005fd8d] [formerly 9d82426b7299d439657afae87ec1b64b07eb0aee [formerly 59c77e70f3]]
Former-commit-id: efdf08e448e71f13e61185fa2211441cb5ec6a6f [formerly 3fca397fc1]
Former-commit-id: e01f1194ec
2013-09-12 11:40:37 -05:00
Steve Harris
af7018b2c9 Merge branch 'master_13.5.2' (13.5.2-4) into omaha_13.5.2
Former-commit-id: 3362379dff [formerly 71ab437e3a] [formerly 348928da7f] [formerly 3362379dff [formerly 71ab437e3a] [formerly 348928da7f] [formerly 322a69b3fa [formerly 348928da7f [formerly a3762af49357106fd308d1a495e64fa2d6389a1e]]]]
Former-commit-id: 322a69b3fa
Former-commit-id: 98bc236326 [formerly 1288d9de57] [formerly 4c3e511967f4c2f6bf9bed9c1d9e3ba69e0ba570 [formerly 10afb1fbaf]]
Former-commit-id: ad20929cf8abd4a5aee9c5e8d53c3fb8d7cf11be [formerly f8ebc33909]
Former-commit-id: 0d1324bc8b
2013-09-12 10:55:44 -05:00
Steve Harris
5bd7027ca5 Merge branch 'master_13.5.1.1' into omaha_13.5.1.1
Former-commit-id: 905a43b2d7 [formerly 029d8287dd] [formerly d6dfaa0927] [formerly 905a43b2d7 [formerly 029d8287dd] [formerly d6dfaa0927] [formerly efa925587d [formerly d6dfaa0927 [formerly 47578eef1ad5c968bcf294d75c0be54478b0378c]]]]
Former-commit-id: efa925587d
Former-commit-id: 03b75339f9 [formerly ef0e6f1c6d] [formerly 2be998745e33aa5b72bf9c64552b41da41eb00a3 [formerly 2b43c67c98]]
Former-commit-id: 00630de94424740a9413a7bde761afc5e7fc83d1 [formerly c1e04be860]
Former-commit-id: 865669f486
2013-09-12 10:28:59 -05:00
Steve Harris
3a21a9eb6c 13.5.2-4 baseline
Former-commit-id: 3d0b711ccf [formerly 595e7bc0d9] [formerly e3c935d48b] [formerly 3d0b711ccf [formerly 595e7bc0d9] [formerly e3c935d48b] [formerly 58c6821427 [formerly e3c935d48b [formerly da631849bc9eaaa5c83c2393520b6099413107a5]]]]
Former-commit-id: 58c6821427
Former-commit-id: a8201afb82 [formerly 4c6790f10f] [formerly 1a01e9adff02825a5599659ed7c17823430819bc [formerly abed443b59]]
Former-commit-id: d4668ee6901a6bb072be3a88eaad320aed699c0f [formerly e2398f74e5]
Former-commit-id: 609926f1f4
2013-09-12 11:13:59 -04:00
Steve Harris
152a9208a2 13.5.1.1-1 baseline
Former-commit-id: dcaa4767f3 [formerly b1fb0f9236] [formerly 5b0cd7cbcc] [formerly dcaa4767f3 [formerly b1fb0f9236] [formerly 5b0cd7cbcc] [formerly d2217643ff [formerly 5b0cd7cbcc [formerly 6ccc6d533c57302d87b49920a236f9f033c90c14]]]]
Former-commit-id: d2217643ff
Former-commit-id: 69b7e120f4 [formerly 3ed8000ce1] [formerly 5d27b520bcecd57bdae31ab83acb368b1f9c3141 [formerly 54e7186749]]
Former-commit-id: 1d87c8d3482c24629f490198056a5a760876a67f [formerly 16f4abff68]
Former-commit-id: 115a97e9ae
2013-09-12 11:03:55 -04:00
Ben Steffensmeier
b0fb6e1efb Issue #2341 relocate the warngen button.
Former-commit-id: 43fdd467fc [formerly 2d4d5653b0] [formerly 8a97c28ac5] [formerly 43fdd467fc [formerly 2d4d5653b0] [formerly 8a97c28ac5] [formerly e5b2090392 [formerly 8a97c28ac5 [formerly 2ef5dd1edf9590eebd6bd18dba53f4d1fd548b72]]]]
Former-commit-id: e5b2090392
Former-commit-id: 1c3e74c762 [formerly dd45cfedfc] [formerly 832a85993c7a070a0e9a72106b4bda8ab96a0c01 [formerly 1cad9c76a6]]
Former-commit-id: e06c7de475fa9973fa5dc4c1a557fb49114c3e52 [formerly 685cfc3080]
Former-commit-id: a974f41165
2013-09-09 14:13:20 -05:00
Ron Anderson
a8b34aaf40 Issue #2329 Cleaned up combinations file saving
Change-Id: I61eea505c36e10239dbb3147bfcc46e513504550

Former-commit-id: aff50967f0 [formerly 7dad82b511] [formerly 68f868117f] [formerly aff50967f0 [formerly 7dad82b511] [formerly 68f868117f] [formerly d069127c28 [formerly 68f868117f [formerly aeda31d9b935af3ae0acadc73016f4c22eb8bbd0]]]]
Former-commit-id: d069127c28
Former-commit-id: c2a33a9585 [formerly 86bf3eeca8] [formerly 6f1186c38aec1d3e5b47eb5ed294059389011ecd [formerly 85c5827504]]
Former-commit-id: ade23be39fcd3d20c590752441b61f66d9ca3952 [formerly a4b214e968]
Former-commit-id: d843a1e2b1
2013-09-09 14:13:08 -05:00
Jonathan Sanchez
3c4cfdeae6 Issue #2176 Increased line width of emergency polygon and changed font for regular warning products.
Change-Id: Icb5456d038a8a2fadbe10f70a2ef32c8ba1f7816

Former-commit-id: 471b68e59d [formerly 3f0c709b3f] [formerly ce051787a7] [formerly 471b68e59d [formerly 3f0c709b3f] [formerly ce051787a7] [formerly a57cec0ed8 [formerly ce051787a7 [formerly 61dd32d0244c9a6af8e63ed2b789cfa15d7c9539]]]]
Former-commit-id: a57cec0ed8
Former-commit-id: 001620d298 [formerly 18e48b4ab5] [formerly 83787eea4ca1bb365af159a618c44ef665e654f1 [formerly ff9bac0d3b]]
Former-commit-id: 99db70f8d1c43d295932b1c5f7d7854e6a5c6c61 [formerly 8a0ae16a5d]
Former-commit-id: 3666e926a5
2013-09-05 11:24:16 -05:00
Steve Harris
09e658e273 Merge branch 'master_13.5.2' into omaha_13.5.2
Former-commit-id: 20515f3382 [formerly d002ceea4d] [formerly f53ac4645b] [formerly 20515f3382 [formerly d002ceea4d] [formerly f53ac4645b] [formerly cdc4971010 [formerly f53ac4645b [formerly 5d8e754f6958fe35dc99df47f8d5a89f133773c8]]]]
Former-commit-id: cdc4971010
Former-commit-id: feef588420 [formerly 57db023bfd] [formerly d155c1fccceb88e90d7805bf327adf3da932e1f8 [formerly b51dd7824a]]
Former-commit-id: 209ca9e227952a5929e8ac999f2885a575359c00 [formerly ca0b90a631]
Former-commit-id: a7d2504923
2013-09-04 13:23:53 -05:00
Steve Harris
58c92ee186 13.5.2-3 baseline
Former-commit-id: 7008da4acd [formerly 91fb128c17] [formerly 9fdd0e51a0] [formerly 7008da4acd [formerly 91fb128c17] [formerly 9fdd0e51a0] [formerly bae0a20b8e [formerly 9fdd0e51a0 [formerly 51ecc8e9e15940e6cbe2c5da55edc5860ea8b0ca]]]]
Former-commit-id: bae0a20b8e
Former-commit-id: c232631639 [formerly 8ac02ce922] [formerly 6d2b921e8731c04bdf279dff1768af30f0c643a6 [formerly c666ac7283]]
Former-commit-id: 4d570483a8273c1504954f4ab46c44871ea3dc74 [formerly ccc5095251]
Former-commit-id: 41a6eebf23
2013-09-04 14:13:29 -04:00
Ron Anderson
f3096dd879 Issue #2321 Fixed smartInits for D2D accumulative parameters
Change-Id: I2cb802f6d0f2d5cc8364d5030a497528b5a3999e

Former-commit-id: f8e3c36887 [formerly 06258f91e6] [formerly d14abbec74] [formerly f8e3c36887 [formerly 06258f91e6] [formerly d14abbec74] [formerly f056b3e02c [formerly d14abbec74 [formerly 5e168359f93663dc160e42495bbe93647c4f4fb8]]]]
Former-commit-id: f056b3e02c
Former-commit-id: f7bbfe8069 [formerly 5aed04b3c1] [formerly 94c3504df3abb5f1715685d70df3dc031be25425 [formerly 4314a3c499]]
Former-commit-id: f9a9177a25106e197a059c57af2b201cd151a979 [formerly 1d6e5ccc99]
Former-commit-id: c5b23e9f11
2013-09-04 08:49:13 -05:00
Steve Harris
199bee9437 13.5.1-20 baseline
Former-commit-id: bbd58fce53 [formerly fb4173d5dd] [formerly a60b097050] [formerly bbd58fce53 [formerly fb4173d5dd] [formerly a60b097050] [formerly 5f2a2434a6 [formerly a60b097050 [formerly 6ae21523e354f26dbf0a668239b75e9b679bbf1f]]]]
Former-commit-id: 5f2a2434a6
Former-commit-id: e7f1079d23 [formerly 0278f189a9] [formerly e9404c23774ef105a8b0951164d0c19a69b16c4d [formerly b99b6cf244]]
Former-commit-id: 821985879690713c438c2f234ab9c69e5a9fa293 [formerly 5373999a27]
Former-commit-id: b11a402718
2013-09-03 09:58:18 -04:00
Steve Harris
ed5b3c910e 13.5.1-19 baseline
Former-commit-id: 12f85e6c92 [formerly d50a0f64c9] [formerly 5b643065e9] [formerly 12f85e6c92 [formerly d50a0f64c9] [formerly 5b643065e9] [formerly 3b296a33b0 [formerly 5b643065e9 [formerly f3acac4ea9a285e64104a55db5b76593147c15e4]]]]
Former-commit-id: 3b296a33b0
Former-commit-id: bdaa93824d [formerly edad929d6a] [formerly 75009c0b37042f112b88cfc51b0c3d9555c67908 [formerly 3e27b2be1d]]
Former-commit-id: 7afcd2aafb5c6c07e90ce0f7253ed22c7c16831e [formerly 9e85745f8a]
Former-commit-id: 225c411e48
2013-09-03 09:48:08 -04:00
Ron Anderson
9da1e30c34 Merge "Issue #2287 Fix yet another NullPointer in GFEColorBarResource" into omaha_13.5.2
Former-commit-id: d3ce70c77d [formerly 9094139a56] [formerly 4eb49628fd] [formerly d3ce70c77d [formerly 9094139a56] [formerly 4eb49628fd] [formerly 1de723239f [formerly 4eb49628fd [formerly 3034c7f8e4b61547abbb79134fb7fd1c059aab28]]]]
Former-commit-id: 1de723239f
Former-commit-id: 5261d62be3 [formerly cfcd83bfa6] [formerly 796428d70da0c3029f375c9d5e11d2d993f6726d [formerly d3ea39d1c2]]
Former-commit-id: eafb980a49b61f22b8ae0d8dc03d52774649bf9d [formerly c79d7d2346]
Former-commit-id: ccef143aec
2013-08-29 17:45:37 -05:00
Ron Anderson
0c897deac1 Issue #2287 Fix yet another NullPointer in GFEColorBarResource
Change-Id: I96ff6cdff49d444f4cb90fb219531901c19460ae

Former-commit-id: d39bc76457 [formerly 5835b2d4fd] [formerly 37d94d921b] [formerly d39bc76457 [formerly 5835b2d4fd] [formerly 37d94d921b] [formerly 2e24094983 [formerly 37d94d921b [formerly dabdce1482cc80b794e8f82ac55d6867a43f0c89]]]]
Former-commit-id: 2e24094983
Former-commit-id: df882296d7 [formerly a1a58c2d35] [formerly 19665b9fc7b0dbb722187cdffb87c4753d092bd8 [formerly dc1323010c]]
Former-commit-id: d5a5113d10b3b6d9e47ec332e18b6d90fed4a80a [formerly 28d7012eda]
Former-commit-id: 8b6d77e18a
2013-08-29 17:38:01 -05:00
Richard Peter
fbea0375b4 Merge "Issue #2279 - updated python qpid library" into omaha_13.5.2
Former-commit-id: 2bd26e963c [formerly dc76e6acfd] [formerly 7ce8d46784] [formerly 2bd26e963c [formerly dc76e6acfd] [formerly 7ce8d46784] [formerly 97517f0108 [formerly 7ce8d46784 [formerly 423c06087708989914ee57eaea17e538ad5e4d17]]]]
Former-commit-id: 97517f0108
Former-commit-id: b5bf307c92 [formerly aa77191711] [formerly 190d0d7cb5bc76b5cd1a08d026c716ab114d9bc4 [formerly 8c9e3bfbb9]]
Former-commit-id: 2a186174e208ca1f29a5953df07a817cff0573d4 [formerly 27f1a3cf53]
Former-commit-id: f693ba6e8d
2013-08-29 17:21:33 -05:00
Ron Anderson
5d879cdbee Issue #2287 Fix null pointer in GFEColorBarResource
Change-Id: I477a7d5cc58e61b9d521337a94801114cecde62a

Former-commit-id: 48e53df2c2 [formerly 59c8dc4fae] [formerly 4e768e812d] [formerly 48e53df2c2 [formerly 59c8dc4fae] [formerly 4e768e812d] [formerly 8f8e041802 [formerly 4e768e812d [formerly add48ba3bbf77e6e7cbfa756e6da75c78aab6f0f]]]]
Former-commit-id: 8f8e041802
Former-commit-id: c889da84c7 [formerly 4cbdeefa33] [formerly 7cfb29e315c4749c5fdc19a78dffa13be4b7c9d8 [formerly 316ba03c10]]
Former-commit-id: 29b17083fe68f025b1eac1563d3b238ee62154fc [formerly d782787ec6]
Former-commit-id: 8349930763
2013-08-29 16:53:55 -05:00
Bryan Kowal
a07518fff7 Issue #2279 - updated python qpid library
- python qpid is no longer compiled; so, the rpm is now noarch


Former-commit-id: 8fef58139c [formerly d77dd5a22c] [formerly 818c69fb39] [formerly 8fef58139c [formerly d77dd5a22c] [formerly 818c69fb39] [formerly f2dd3ab85a [formerly 818c69fb39 [formerly 8487a7abdc967f39f853919b5c274b354a674b2c]]]]
Former-commit-id: f2dd3ab85a
Former-commit-id: b1bf6e0a12 [formerly 572e1c0b33] [formerly b9c85eb335c2aff8b9e5423dcca60dd53d345f8c [formerly 981562faac]]
Former-commit-id: a6f7447916c695581b264be93e6408c465105922 [formerly b1aed4e6fd]
Former-commit-id: 94b4a54523
2013-08-29 16:00:45 -05:00