Commit graph

3198 commits

Author SHA1 Message Date
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
Ron Anderson
1f72e4a276 Merge "Issue #2287 Fixed fitToDataColorTable for Single Grids" into omaha_13.5.2
Former-commit-id: 1c7890b692 [formerly 6a42802aba] [formerly ef10d1aa13] [formerly 1c7890b692 [formerly 6a42802aba] [formerly ef10d1aa13] [formerly 183d3944e4 [formerly ef10d1aa13 [formerly 72e14b106419a137075642c77a051fa82ddb91e1]]]]
Former-commit-id: 183d3944e4
Former-commit-id: 39cdff917f [formerly 8b688aa10f] [formerly 2c7505d26edbe6b08be792f686a4bde5c6656966 [formerly e366726d06]]
Former-commit-id: 0f0d7a568410336451b4acbd53f39c2c3eb5ba9a [formerly 9fa57c63a6]
Former-commit-id: 7fd0fe6ba7
2013-08-29 14:25:45 -05:00
Steve Harris
d4ac47d817 Merge branch 'master_13.5.2' (13.5.2-2) into omaha_13.5.2
Conflicts:
	msi/VizLauncher/VizLauncher.suo
	msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
	msi/build/A2Staging/VisualStudio/VizLauncher.exe

Former-commit-id: b6df6f2aaa [formerly 4a0604f28c] [formerly 866885e3eb] [formerly b6df6f2aaa [formerly 4a0604f28c] [formerly 866885e3eb] [formerly 347d1eaef4 [formerly 866885e3eb [formerly c3a0913f289df802c65015686f877ca9c5e42bf5]]]]
Former-commit-id: 347d1eaef4
Former-commit-id: b800b32b9e [formerly 539b51afc9] [formerly 3fd03f9ee6b9805b2ebcb1741513edfb88c0e02f [formerly 9a6a2561fc]]
Former-commit-id: 787b21002c060468c496b24a83315fa2608c04a8 [formerly 29e2e0a01c]
Former-commit-id: db663043c7
2013-08-29 14:19:17 -05:00
Steve Harris
7c47939632 13.5.2-2 baseline
Former-commit-id: 8dcd159377 [formerly 8cde3b2b54] [formerly 4a47fb97c5] [formerly 8dcd159377 [formerly 8cde3b2b54] [formerly 4a47fb97c5] [formerly 9e4bf0cf2e [formerly 4a47fb97c5 [formerly 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9]]]]
Former-commit-id: 9e4bf0cf2e
Former-commit-id: c10c39b5d6 [formerly 12b0ab91fd] [formerly 8411cf39c13b7f63f746f4a1b8806ba15bfa7510 [formerly 5de6d566f0]]
Former-commit-id: ac9d4632081685ff126231e5a993f8fb95aba22d [formerly 180e042b5d]
Former-commit-id: db64b2e2d9
2013-08-29 15:01:29 -04:00
Ron Anderson
b596549144 Issue #2287 Fixed fitToDataColorTable for Single Grids
Change-Id: I00325b40af3803bd0cfed601371904e5e24c1abe

Former-commit-id: c43f9b53b7 [formerly 344db44bc7] [formerly 37795f1407] [formerly c43f9b53b7 [formerly 344db44bc7] [formerly 37795f1407] [formerly 0b6ec808f2 [formerly 37795f1407 [formerly 1cffae67f0150e1a2b1509e560383aa506e4284f]]]]
Former-commit-id: 0b6ec808f2
Former-commit-id: a960a14616 [formerly 078a619cf8] [formerly a550664bb651dd6a73d71cff9bda58ab55f5fb48 [formerly 561d4cce0b]]
Former-commit-id: 42141e07cc2f871dd2d112f63a7feb6961f8a5b3 [formerly a70032a961]
Former-commit-id: 05224fd829
2013-08-29 13:36:04 -05:00
Max Schenkelberg
e22453784e Issue #2300 Fixed NPE in TileSetRenderable with ConcurrentHashMap
Change-Id: I9d92e330c66364b2eb904d5858eb6d8a4a75a542

Former-commit-id: 6528df1ebd [formerly 02cc4abf19] [formerly dc6ed0a61e] [formerly 6528df1ebd [formerly 02cc4abf19] [formerly dc6ed0a61e] [formerly 6eedb5e26d [formerly dc6ed0a61e [formerly 34f9fdb02b82dd27d8f266bcd78291ebd9586bb5]]]]
Former-commit-id: 6eedb5e26d
Former-commit-id: 279e1c5919 [formerly d1d134697d] [formerly 3a285880333b23d324c21d685304b5e10b43400d [formerly 7175092cb9]]
Former-commit-id: a220d979e7e36cbbd9046907b3d4b446c63fe99e [formerly e7406a6b07]
Former-commit-id: e2fa55d75a
2013-08-28 14:03:13 -05:00
Ron Anderson
afa8131936 Merge "Issue #2302 Fixed simultaneous save issue. Cleaned up AutoSave." into omaha_13.5.2
Former-commit-id: 4d4077eac0 [formerly de2507a851] [formerly 89c1f24ff8] [formerly 4d4077eac0 [formerly de2507a851] [formerly 89c1f24ff8] [formerly a78ebffdb5 [formerly 89c1f24ff8 [formerly 475d289ae5a3a024d5f52f7a2c8263533ada6e3f]]]]
Former-commit-id: a78ebffdb5
Former-commit-id: b336ad1bad [formerly 0264f3dee8] [formerly 032444fcc52a3ceb8c31137e43347e52644dcf76 [formerly a7a4f9d60e]]
Former-commit-id: a2604d18a3271afd7752690a1b843d5d7a838067 [formerly 0473feab57]
Former-commit-id: f157906d33
2013-08-28 11:18:34 -05:00
Steve Harris
d024632795 Merge branch 'master_13.5.2' (13.5.2-1) into omaha_13.5.2
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: eb43afb042 [formerly 34e085ff97] [formerly 0791be2b77] [formerly eb43afb042 [formerly 34e085ff97] [formerly 0791be2b77] [formerly cfe2ba88ad [formerly 0791be2b77 [formerly 5e0080743ae12b96d828451014a16ea118e25ce0]]]]
Former-commit-id: cfe2ba88ad
Former-commit-id: 4ef41d2c35 [formerly 5abb143d01] [formerly 727a02ca1cf8ee5783dc8270301e0e9ffbdc71dc [formerly 116daf48ff]]
Former-commit-id: de89d4d0d46831d5cb7f87f4d593498c95a3b353 [formerly 41b7f325bb]
Former-commit-id: 821a722a72
2013-08-28 09:03:09 -05:00
Steve Harris
85235051aa 13.5.2-1 baseline
Former-commit-id: 3cd0b2dfc6 [formerly 894d2425b2] [formerly 73dd0f166c] [formerly 3cd0b2dfc6 [formerly 894d2425b2] [formerly 73dd0f166c] [formerly 542b2c3d18 [formerly 73dd0f166c [formerly a362ca91ee5972a1501a2842191fbe2e23feac9c]]]]
Former-commit-id: 542b2c3d18
Former-commit-id: b4e006162f [formerly 43af1b227a] [formerly 43ff166b6d3df833e29603f504019d7b3776a1d1 [formerly 4ecb349ed8]]
Former-commit-id: 551ebb34fc0bd9a337eef969bbbeff276486196a [formerly 4a9a91ce2e]
Former-commit-id: 1900cef156
2013-08-28 09:43:48 -04:00
Ron Anderson
74e3b60845 Issue #2302 Fixed simultaneous save issue. Cleaned up AutoSave.
Change-Id: I3d9b8b2441a0b79d393ab4591450b084d24dafc3

Former-commit-id: 559e27a75f [formerly 66032fcfd7] [formerly f75dc91293] [formerly 559e27a75f [formerly 66032fcfd7] [formerly f75dc91293] [formerly ab4c1ebe5d [formerly f75dc91293 [formerly 29e2ea5d61af71a366d3a81908b16b4c6a6850f6]]]]
Former-commit-id: ab4c1ebe5d
Former-commit-id: a5ed604867 [formerly 877f9b9bc3] [formerly 2ba0e690bd1e8ad733aed2a649ff316d58215905 [formerly 2670db83fd]]
Former-commit-id: 683c167d3c9d89fec96ca5f85e5e95fdc7f8fed2 [formerly c71a74ef01]
Former-commit-id: 5ff2d27371
2013-08-27 18:54:14 -05:00
Ron Anderson
10c4f31a29 Issue #2287 Fix scaling and direction of wind/swell arrows in GFE
Change-Id: Id12823256fc3c383005098b83e72249284a36f33

Former-commit-id: 04def1379d [formerly df357588a0] [formerly 77db16933e] [formerly 04def1379d [formerly df357588a0] [formerly 77db16933e] [formerly 803515f4ff [formerly 77db16933e [formerly b0c88cb7d71cf3e081596cd47d88d8412c2ea3d1]]]]
Former-commit-id: 803515f4ff
Former-commit-id: 8e26902f09 [formerly a1952b7c75] [formerly 5764de917b8e19b33bed0061d37a440fbc638101 [formerly 518e32206e]]
Former-commit-id: d26ed86e870075626eee8ef2d9a17dc3e4e9f171 [formerly d4a2df4eb5]
Former-commit-id: 24f43305b3
2013-08-27 13:51:17 -05:00
Bryan Kowal
30286d2f79 Issue #2198 - completely override the Path and PythonPath in the environment.
- PythonPath is specific to CAVE and will not normally be set
- What is currently set in Path is not relevant because we are running ported code


Former-commit-id: 3fa97d7819 [formerly 6b9ca89bbc] [formerly f5c3b89dd2] [formerly 3fa97d7819 [formerly 6b9ca89bbc] [formerly f5c3b89dd2] [formerly e1415e3689 [formerly f5c3b89dd2 [formerly 1edbb1847a9dfda4fa7562972b70c8ca3f83f246]]]]
Former-commit-id: e1415e3689
Former-commit-id: 1659386a9c [formerly 5b58abe854] [formerly 47dedaefabeda6c6ca4ce57a08b9555bae5e9e89 [formerly 5458f6956b]]
Former-commit-id: caf5ae2a02e399f6e14aeaac73826d152ff92803 [formerly 029369f3d5]
Former-commit-id: 1ae985d556
2013-08-26 12:43:43 -05:00
Lee Venable
f6c99df2df Issue #2283 - cleaned up some synchronizrd code.
Former-commit-id: 6c390e5ffd [formerly b8f94691c1] [formerly 027dae1e9b] [formerly 6c390e5ffd [formerly b8f94691c1] [formerly 027dae1e9b] [formerly ea4df9cb2d [formerly 027dae1e9b [formerly f162222be931d03c3a0401205869d48854703c36]]]]
Former-commit-id: ea4df9cb2d
Former-commit-id: 894dbe333c [formerly b03ec5a6fe] [formerly febc79faa2ce62e69731f24e1957e231711e9664 [formerly d3268de97a]]
Former-commit-id: 6afcdd6b1d1037e40a53e9765aa27a8f9b8be802 [formerly fc562788fd]
Former-commit-id: ee53cc88fa
2013-08-26 09:41:21 -05:00
Steve Harris
6d26ed7abe Merge branch 'master_13.5.2' (13.5.1-18) into omaha_13.5.2
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	nativeLib/edexBridge/edexBridge.cpp

Former-commit-id: abb7bdd7ed [formerly decc9e4c36] [formerly e361386eab] [formerly abb7bdd7ed [formerly decc9e4c36] [formerly e361386eab] [formerly 119af8a466 [formerly e361386eab [formerly a3671ea2935178a28dce6d075dc2067a609e6725]]]]
Former-commit-id: 119af8a466
Former-commit-id: edd03a1cf1 [formerly f56b906997] [formerly 4e6f59fd5b911fc5753e9e8c4824360e1ab43c50 [formerly 5b11d137df]]
Former-commit-id: 74866ea308428f032b7296817aec930a463a2eda [formerly 7a5e176937]
Former-commit-id: daa4470372
2013-08-23 11:36:43 -05:00
Jonathan Sanchez
f101dbd8c5 Issue #2176 Implemented emergency warning products.
Cherry picked from 13.6.1 e6bb79e45c989e4292b8485307ae239e491cb630 [formerly 67ce90c14a] [formerly 46d5bd4f0a [formerly c62de0d75f] [formerly 7d74ba5ee1] [formerly 46d5bd4f0a [formerly c62de0d75f] [formerly 7d74ba5ee1] [formerly 67ce90c14a [formerly 7d74ba5ee1 [formerly 36df6339cc00afc5935746a4a47b0e9e8c641f85]]]]] to 13.5.2

Change-Id: I80623a63abd495baf3e0004625732f26453a30d9

Former-commit-id: 4ff3193e89 [formerly 051cdc28c2] [formerly e0bd81c0ae] [formerly 4ff3193e89 [formerly 051cdc28c2] [formerly e0bd81c0ae] [formerly cf51ba9e9c [formerly e0bd81c0ae [formerly be486757ed36916c1c3a1e56ddf98754b900b693]]]]
Former-commit-id: cf51ba9e9c
Former-commit-id: 1fefefe9d8 [formerly c9026b5709] [formerly 1288c49579d7228f01cfd602e4cd73832a09bc32 [formerly 051c8103c7]]
Former-commit-id: 735eac1bab38f5f7f615a4f12af3ab949f8af99e [formerly 9280f2920f]
Former-commit-id: 9a0132231a
2013-08-22 12:25:42 -05:00
Lee Venable
dfd7cf4793 Merge "Issue #2177 Improve county portion descriptions." into omaha_13.5.2
Former-commit-id: fadc0d374c [formerly a0437634dc] [formerly 07f087013f] [formerly fadc0d374c [formerly a0437634dc] [formerly 07f087013f] [formerly 321ddebdde [formerly 07f087013f [formerly 1b7f1d8dce2cc1161ce06ca0c4a8df68803a12e1]]]]
Former-commit-id: 321ddebdde
Former-commit-id: 6ef5a7c3f2 [formerly f5f1525809] [formerly 1825a07f92bc280ec091a8ccab5f7014fa0d7773 [formerly 0af2308491]]
Former-commit-id: 705ca234c1648eef24d9677f8d303e21998ee67a [formerly 2e26b28a40]
Former-commit-id: 490df21887
2013-08-22 11:53:18 -05:00
Jonathan Sanchez
5033440b4f Issue #2177 Improve county portion descriptions.
Change-Id: I9b2326e0b57b2bba7223032e3f08846f0d2f121d

Former-commit-id: 833a869e69 [formerly 67602003cd] [formerly 0c06112925] [formerly 833a869e69 [formerly 67602003cd] [formerly 0c06112925] [formerly 321799e07b [formerly 0c06112925 [formerly a8e74ba813cc841c6cc6ff06df73080d1ce1fd8c]]]]
Former-commit-id: 321799e07b
Former-commit-id: ee0f46321b [formerly e1663e7f8d] [formerly 09f6083745f373a9f45f183c6c6d17c10d6388bb [formerly edbc238355]]
Former-commit-id: b808cf0741b3b1f7dd690034fd6dd22ba76e54a3 [formerly 4d8a18180b]
Former-commit-id: 119e5fd91d
2013-08-22 10:49:09 -05:00
Steve Harris
690e24905c 13.5.1-18 baseline
Former-commit-id: 80d8236464 [formerly d931b80e70] [formerly afb34814dd] [formerly 80d8236464 [formerly d931b80e70] [formerly afb34814dd] [formerly 0a7acf96c7 [formerly afb34814dd [formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]]]]
Former-commit-id: 0a7acf96c7
Former-commit-id: ff31991527 [formerly 261b1da9d6] [formerly bef853d6001eb232a3c91986195c4ab5e86bc9cd [formerly 2f9aa87a9f]]
Former-commit-id: 9f45e3bbb3ed565bf3eab964a0ff4d2313fd7eda [formerly cde7f2a59c]
Former-commit-id: 6c258a0b7c
2013-08-22 09:12:43 -04:00
Steve Harris
00171e3e49 Merge "Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now" into omaha_13.5.2
Former-commit-id: 582a064d32 [formerly e6b0fcf6c9] [formerly cb1b7ecc55] [formerly 582a064d32 [formerly e6b0fcf6c9] [formerly cb1b7ecc55] [formerly a1b6f8c50c [formerly cb1b7ecc55 [formerly 37c80d08633e4ab0f7ba6ead07e4cb6fa54e1194]]]]
Former-commit-id: a1b6f8c50c
Former-commit-id: ff241c56cc [formerly 617c51d5f6] [formerly 083b33e0f234f33e224fd84a229c56f0ec078317 [formerly a2f17e7af1]]
Former-commit-id: 8480f04862cb0c2ccf4fcb4ce930e0b43de22c17 [formerly 572e76e384]
Former-commit-id: dd7caa0780
2013-08-21 10:37:52 -05:00
Ben Steffensmeier
0e7410af64 Issue #2194 Fix site override.
Former-commit-id: 85c71b7714 [formerly de00b302b3] [formerly 791c6a9890] [formerly 85c71b7714 [formerly de00b302b3] [formerly 791c6a9890] [formerly dac718634c [formerly 791c6a9890 [formerly faba58780d497f8db564c0fa325c07b35326e010]]]]
Former-commit-id: dac718634c
Former-commit-id: f558d240ba [formerly e757a184e1] [formerly 1d5ea6677cdb2f75d1fabaa5d51f91e64314f0f3 [formerly 4e218e9e56]]
Former-commit-id: a02dba3599b3b1b5adf9600921abcccfccb91510 [formerly 7bf35bdac6]
Former-commit-id: 48ac0e726d
2013-08-20 14:47:32 -05:00
Bryan Kowal
eb05558a87 Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now
- Note: VizLauncher and AWIPSII.CAVE are NOT Eclipse projects.


Former-commit-id: 3e9c78b9e0 [formerly 013ba62af1] [formerly a1fccaa598] [formerly 3e9c78b9e0 [formerly 013ba62af1] [formerly a1fccaa598] [formerly 21cfeb1b83 [formerly a1fccaa598 [formerly c1c6cd087a493f052a66fbc6e7b608cd959f7905]]]]
Former-commit-id: 21cfeb1b83
Former-commit-id: c350450024 [formerly eec811c3b1] [formerly 28e6522f39684a2c80f4e36f7968404f94210af4 [formerly 6cf776926c]]
Former-commit-id: d4152ca5536158bbd4ab18c8cc1af71b6f8ede23 [formerly 433efe1982]
Former-commit-id: 8503422d36
2013-08-20 13:56:07 -05:00