Commit graph

5678 commits

Author SHA1 Message Date
Nate Jensen
68c1225357 Merge "Omaha #3133 remove edex dependencies from common.monitor plugin" into omaha_14.4.1
Former-commit-id: 518f879baa [formerly 24b13b35d3] [formerly 01a09b72b8] [formerly 7bd8e3912c [formerly 01a09b72b8 [formerly 6eba192ac26a80f8ba1402f675a7ab9e9f4dd6a5]]]
Former-commit-id: 7bd8e3912c
Former-commit-id: eaf1157b7a1e8921a018bf59ef994f27b238d343 [formerly dff74c3ce8]
Former-commit-id: 225729e3e6
2014-05-13 09:17:37 -05:00
Nate Jensen
acaa6c625b Merge "Omaha #3013 added libgfortran and libf2c requires to the awips2-python-numpy rpm." into omaha_14.4.1
Former-commit-id: c65f88f9e0 [formerly 9f152e6831] [formerly 0f012ef8c9] [formerly ca5dcff86a [formerly 0f012ef8c9 [formerly 7f2de8795a6648853e66cdac4676351d40fef3e0]]]
Former-commit-id: ca5dcff86a
Former-commit-id: f43d415ec56ef2c160676b1d22983167e0ae1e77 [formerly 5a5d4a6059]
Former-commit-id: fd364078e0
2014-05-13 09:00:06 -05:00
Nate Jensen
a057e5389c Omaha #3133 remove edex dependencies from common.monitor plugin
Change-Id: Iea84cdadc86b9bb137bc2e34d546e51f9978d5e3

Former-commit-id: ec4768ed4b [formerly 88535c69f5] [formerly cc86f19bad] [formerly b05630b171 [formerly cc86f19bad [formerly d25e1bee210a084e17d4ee781eddb42c14735140]]]
Former-commit-id: b05630b171
Former-commit-id: b39b5e72eb5dbb60bd6eb1dd766f167f0f6d7044 [formerly 3aff81313f]
Former-commit-id: 5d099a3b4b
2014-05-12 16:46:06 -05:00
Steve Harris
21d4fd737c Omaha #3132 - merge omaha_14.3.1 into omaha_14.4.1
Former-commit-id: 9bdd47b352 [formerly 0ee182ad6f] [formerly e955496335] [formerly 4d1b6ddc00 [formerly e955496335 [formerly de217b0bd6bbf72ea138f9bc1286992d43d72ef1]]]
Former-commit-id: 4d1b6ddc00
Former-commit-id: fd76fb12bdeec24798c2ed49ce6427f94d766cc0 [formerly 233bc14114]
Former-commit-id: fe671df079
2014-05-12 15:37:43 -05:00
Richard Peter
52638d1ed1 Merge "Omaha #3133 remove incorrect dependencies" into omaha_14.4.1
Former-commit-id: 6f20be9eb9 [formerly 2f186a7789] [formerly c3ed3b97b8] [formerly b7a0429580 [formerly c3ed3b97b8 [formerly a79d57e86958129b210d13d301b2dc9c1c80f53e]]]
Former-commit-id: b7a0429580
Former-commit-id: 19fa6aa6d77e2f36139363870ef22ca120234137 [formerly e36d6eaf3a]
Former-commit-id: 3b0542427c
2014-05-12 15:28:46 -05:00
Richard Peter
07296dab2d Merge "Omaha #3133 remove some unnecessary edex dependencies" into omaha_14.4.1
Former-commit-id: e324b90667 [formerly 555b8a2109] [formerly b2ce12a907] [formerly 5e6e619e82 [formerly b2ce12a907 [formerly 37f5013d6e64616a2959d95de9d2b1569e3f4286]]]
Former-commit-id: 5e6e619e82
Former-commit-id: ab03fa4433fd6be81a0130625f1afbe542d4a78d [formerly ba573df2b1]
Former-commit-id: d5eb22ae5d
2014-05-12 15:21:38 -05:00
Nate Jensen
02184e5ad4 Omaha #3133 remove incorrect dependencies
Change-Id: Iadccd506bb3fd1f009efeda82193138088a2895f

Former-commit-id: 201c21929d [formerly 8137d27223] [formerly 2d32999655] [formerly d2f86668df [formerly 2d32999655 [formerly 6db290e14df962d91174727b027b0c5afc1ed0ce]]]
Former-commit-id: d2f86668df
Former-commit-id: a79d24d3bf3e4d0985ec5cb7dba485d7deac944f [formerly 559993eaf9]
Former-commit-id: 3262ff511d
2014-05-12 15:21:08 -05:00
Nate Jensen
ac044051c1 Omaha #3133 remove some unnecessary edex dependencies
Change-Id: I91f10fb36ecadf8e2fc830b135b5d245830417a2

Former-commit-id: be81c7cfc2 [formerly 719014f89a] [formerly 15329c6b03] [formerly 54dbc0ef71 [formerly 15329c6b03 [formerly 846003056f07ef205f59c7b043a31a4fa66e5977]]]
Former-commit-id: 54dbc0ef71
Former-commit-id: 7260996a09ae3b4fe6a33660daff25f0823c0bb9 [formerly 2bb07cddf0]
Former-commit-id: 7d417bb6b5
2014-05-12 15:07:46 -05:00
Steve Harris
7f7e8e69a4 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/SliceSample.py
	edexOsgi/com.raytheon.uf.edex.auth/resources/thriftService.properties
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java

Former-commit-id: 856f5bc3b7 [formerly b3bc71c8a4] [formerly 652fb19bc4] [formerly 6964df0664 [formerly 652fb19bc4 [formerly a20833879f1a0434c562a22a874b1e1722278954]]]
Former-commit-id: 6964df0664
Former-commit-id: 9655787e1bc6f95e4e9dab9054aa147d706bdd37 [formerly 661eceea83]
Former-commit-id: 77b2da7a4f
2014-05-12 15:05:43 -05:00
Brian Clements
028f89220f Omaha #3107 cleaned up openfire foss project exports
openfire foss project was exporting too many transient dependencies
changed to only export needed packages


Former-commit-id: e30355435b [formerly 97d6e82c14] [formerly 634295ceb7] [formerly 1109404260 [formerly 634295ceb7 [formerly 748382d20485400f85b9bf790774ec5482be1624]]]
Former-commit-id: 1109404260
Former-commit-id: 8dca5cfa504e55b89fb5b00692d4ce197145f8a6 [formerly 7aa6cfaa33]
Former-commit-id: 83d56c4eca
2014-05-12 12:45:02 -05:00
Richard Peter
e7d80f7c67 Issue #3154: Remove stats reclaimSpace call
Change-Id: I32fb957e236f257e5d8164833d2d2c1adf1fa639

Former-commit-id: a661a16f01 [formerly a077fd9cc6] [formerly fae9e811fb] [formerly 5648e27bbc [formerly fae9e811fb [formerly 4e35d1fa5e3e1ebaa5d177d95a5eb11741ae57d2]]]
Former-commit-id: 5648e27bbc
Former-commit-id: f56db3df561a3729a49b418c7643ed5a2924b76f [formerly f53d5ba7e9]
Former-commit-id: 87bb7ac342
2014-05-12 12:27:32 -05:00
Brian Clements
bc2ac0198b Omaha #3152 removed monitorsrv
jmx plugin that is currently not used and required dependency maintenance


Former-commit-id: 083b68d7b4 [formerly 2de644c9e3] [formerly 87aa26bf5a] [formerly ed8b9f5a89 [formerly 87aa26bf5a [formerly 7a00a651afb1c4251b52a852b01696cc861640be]]]
Former-commit-id: ed8b9f5a89
Former-commit-id: e2220ff9eabf1270c1ef05bef631dcc980ffdf3f [formerly b75243d000]
Former-commit-id: 7d9eaa94c5
2014-05-12 12:13:28 -05:00
Nate Jensen
baa755e914 Merge "Omaha #3075 updates for pydev 3.4.1" into omaha_14.4.1
Former-commit-id: 17d9ff2607 [formerly 650edc41f3] [formerly eff5a8e32f] [formerly ab064743f4 [formerly eff5a8e32f [formerly a213a01ac89bf84a6a0d4dfea44073cb0b2a7fce]]]
Former-commit-id: ab064743f4
Former-commit-id: 94b65ff379509fa2a8147231bb03f64db8b50e59 [formerly 7afd18662d]
Former-commit-id: c57623dc52
2014-05-12 11:56:34 -05:00
Bryan Kowal
cf491026b0 Issue #3026 - remove unnecessary hpe ffmp dependency
Former-commit-id: 163a517f0a [formerly 8f16f25cd7] [formerly 6e6a6a73ee] [formerly faa6b09ac9 [formerly 6e6a6a73ee [formerly c94c973ef6a663f93a6b1a6301f5553d4e88ac73]]]
Former-commit-id: faa6b09ac9
Former-commit-id: d118ff248800b223cac6d3532aa23ae410ceee1c [formerly 5f5987f57b]
Former-commit-id: 9153d61b90
2014-05-12 11:46:35 -05:00
Brad Gonzales
3a34fa94b8 Omaha #3013 added libgfortran and libf2c requires to the awips2-python-numpy rpm.
Change-Id: I3f232c800a7d2768b9b13b35703db97b83789a7b

Former-commit-id: 8e97465d95 [formerly c71a842639] [formerly 982503cb41] [formerly abf6125958 [formerly 982503cb41 [formerly 632b2cad7a328dead678026c673b001be0657394]]]
Former-commit-id: abf6125958
Former-commit-id: 79273dd077c6b21e43dbd9cf0c4da9314a753fa8 [formerly b032306b52]
Former-commit-id: 9679fb32dc
2014-05-12 11:25:16 -05:00
Nate Jensen
78e3feab07 Merge "Omaha #2733 changes to match ufcore distribution pattern changes" into omaha_14.4.1
Former-commit-id: 12ac619cb6 [formerly 0a3a7c2b7d] [formerly 03ff2df660] [formerly ccc69d4e70 [formerly 03ff2df660 [formerly 53423c44c2c979e9c16c2bfd21eb120f1182bbce]]]
Former-commit-id: ccc69d4e70
Former-commit-id: 910149ad9b71467b35a24ac4d3d5b619ecc5516e [formerly 467891a7ad]
Former-commit-id: 8b272d5626
2014-05-12 09:28:37 -05:00
Brian Clements
26064a9629 Omaha #2733 changes to match ufcore distribution pattern changes
this change depends on changes from #3151
required plugins will prevent edex from starting if there are no valid dist patterns
removed distribution registration from geomag since it did not contain any valid patterns


Former-commit-id: 4d2d5f81df [formerly 243ba8476a] [formerly 8b07016f25] [formerly 316bfe3b6f [formerly 8b07016f25 [formerly e917569da8e837a1c340b0e992a0c59f0a3507f3]]]
Former-commit-id: 316bfe3b6f
Former-commit-id: fbf8cffad16b3edb70ad15a4742dcdc5c87e748c [formerly 9cc5ee88b5]
Former-commit-id: 546cf300df
2014-05-12 09:14:28 -05:00
Nate Jensen
b4747e1967 Omaha #3075 updates for pydev 3.4.1
Change-Id: I2d7ed5e73f837f42dea3de35cdf79dd98c7586b1

Former-commit-id: 7e3a38d473 [formerly 5fcc126e57] [formerly e6569b4a7d] [formerly bb32858c04 [formerly e6569b4a7d [formerly a038aea9bb25e31b29b054e8899c0b51bc183fef]]]
Former-commit-id: bb32858c04
Former-commit-id: 1c3c85d7dc8e6b4c5d374cb39021ba2a71dac98c [formerly 5d08184312]
Former-commit-id: 651ce74777
2014-05-09 16:45:39 -05:00
Brian Clements
87d24b248b Omaha #3107 added timeout handling logic for leader transfer verification
Former-commit-id: 7db361813c [formerly 26d206f780] [formerly 08a406ff18] [formerly 7b7bc5be97 [formerly 08a406ff18 [formerly 294a489ba547bf90df9d6b6a5107c8993c5b8333]]]
Former-commit-id: 7b7bc5be97
Former-commit-id: 420481d439ea6530a366a6c1534bebf4d5ede131 [formerly 3d3d7f04bb]
Former-commit-id: 98e74677fd
2014-05-09 15:43:46 -05:00
Lee Venable
0fc85255e4 Merge "Issue #3145 - Fix Scan threat labels, dispose font" into omaha_14.3.1
Former-commit-id: bb5cc2c9ac [formerly cd5956d21a] [formerly 364f0d877a] [formerly e3c6407be3 [formerly 364f0d877a [formerly 06b3cb4dd8f07600e6513a15a2495b485b0812b6]]]
Former-commit-id: e3c6407be3
Former-commit-id: c5990d4401145dd3609123f0dd6741e9a15c26ae [formerly b06e8e6e3e]
Former-commit-id: a46987ef36
2014-05-09 11:14:51 -05:00
Nate Jensen
8bc0acc137 Merge "Issue #2928: Increase default thriftService byte limit to 250MB" into omaha_14.3.1
Former-commit-id: ab17f8b84e [formerly ed687984f7] [formerly 486c69045d] [formerly 5849925092 [formerly 486c69045d [formerly dac16ee8f25f6f265426405ca2bff55aff5b57ba]]]
Former-commit-id: 5849925092
Former-commit-id: d5ee78ec7147794ad7f544578dc0b0342780e4bf [formerly 9091c46153]
Former-commit-id: b663cb9989
2014-05-09 10:57:53 -05:00
Richard Peter
df357a67fe Issue #2928: Increase default thriftService byte limit to 250MB
Change-Id: I8a55fbce410e1787946f2dd38b3a41c84aab20bd

Former-commit-id: 87dec39958 [formerly b809ed50fd] [formerly bd033db0f4] [formerly acadd5b815 [formerly bd033db0f4 [formerly 1c5060d53524f195be7854ca66160d3d075c3112]]]
Former-commit-id: acadd5b815
Former-commit-id: b8973f06ea7a4e92647ce294c743d62f40633638 [formerly 67d637938e]
Former-commit-id: 036909b7ac
2014-05-09 10:37:18 -05:00
Mike Duff
4d00418164 Issue #3145 - Fix Scan threat labels, dispose font
Change-Id: I385e184d81a021a350c7df7ee4948ad7e407784d

Former-commit-id: 279dd3dbad [formerly 158fb46b9f] [formerly 03356dd554] [formerly a81569849b [formerly 03356dd554 [formerly 84bd0800b2652b31c06015fa49f816f1402f461d]]]
Former-commit-id: a81569849b
Former-commit-id: 9842522c95a5493559d096bac98243e002212bfa [formerly 4ec26b6e31]
Former-commit-id: 456038d161
2014-05-09 10:32:04 -05:00
Brian Clements
08eeff08a7 Omaha #3147 removed spring from groovy RPM component spec
Former-commit-id: b6155d5482 [formerly 9d67a6c30b] [formerly 3bb680802a] [formerly b334038a28 [formerly 3bb680802a [formerly 979ff20d55cc86319805f77ec53f32cb39555eb3]]]
Former-commit-id: b334038a28
Former-commit-id: fe9d492be607366f7a5a5fb0e82f5ed775491ae6 [formerly 3a48b2036e]
Former-commit-id: 6192ab51ae
2014-05-09 10:31:28 -05:00
Nate Jensen
f15db04d4f Merge "Issue #3026 - feature.xml fix" into omaha_14.3.1
Former-commit-id: 3330d7e72d [formerly d0d20849b6] [formerly 575360192a] [formerly e8c4279d10 [formerly 575360192a [formerly 25e500435693940e378df086739fce8eefdba3bb]]]
Former-commit-id: e8c4279d10
Former-commit-id: 0b7be915c239ef7a407a8fcd6ca62efe41a54d6d [formerly 95ca77688a]
Former-commit-id: e0365dd4a3
2014-05-09 09:53:25 -05:00
Mike Duff
b8696720cd Issue #3026 - feature.xml fix
Change-Id: I07d5043a8c968fa841f4e94eee47617e018ea794

Former-commit-id: 53d81818d3 [formerly 7e996909d1] [formerly 78f2a26903] [formerly 038b2b7500 [formerly 78f2a26903 [formerly a44e412190741fcb0a91dd451ae538277ae0d79f]]]
Former-commit-id: 038b2b7500
Former-commit-id: a4741aa0a763cbbf63af15c647cd18f0d20c6fd6 [formerly c7f5379b78]
Former-commit-id: b73e635162
2014-05-09 09:27:10 -05:00
Nate Jensen
99765ab821 Merge "Issue #2920 Fix default color of BOXED text." into omaha_14.3.1
Former-commit-id: 0218777451 [formerly 00642fb2c6] [formerly 508b1f7a16] [formerly d7e4827ec4 [formerly 508b1f7a16 [formerly 7586d91814535ff6ad1f620f973279fe17914e6b]]]
Former-commit-id: d7e4827ec4
Former-commit-id: 82f6b0b5b7703cbb3ead5a955a74de67dabf3125 [formerly 649f316001]
Former-commit-id: 60a824728d
2014-05-09 09:23:15 -05:00
Ben Steffensmeier
ad64b8b197 Issue #2920 Fix default color of BOXED text.
Former-commit-id: ee99dba933 [formerly 60479824d1] [formerly 87ea43cf0d] [formerly 9d4c33ba91 [formerly 87ea43cf0d [formerly 59f12cd4cc60f0908c106cbc0572d3f84d0d509b]]]
Former-commit-id: 9d4c33ba91
Former-commit-id: faee1aa6dd05debf6ff2f60a54d18fa91ba9f91e [formerly 199a2df79e]
Former-commit-id: 082a5c515d
2014-05-08 18:18:08 -05:00
Bryan Kowal
5fc64e628b Issue #3108 - update bignsharp for Windows 64-bit compatibility. Upgrade JNA.
Amend: updated and/or added change revision history comments
Amend: fixed Java requirement in JNA classpath
Amend: fixed Java requirement in JNA MANIFEST

Change-Id: I5033f05c48a271fe08d3ec2ac01fe79481564371

Former-commit-id: 70db1c7dc7 [formerly 79244f5032] [formerly 1e1f46e68b] [formerly 9c29e6739c [formerly 1e1f46e68b [formerly fb12234836a3562156a30531e6961c0a064588bd]]]
Former-commit-id: 9c29e6739c
Former-commit-id: 76e1a6eaf85a9ea37060e092691ba1ca871a7e9e [formerly c1e9154e89]
Former-commit-id: 2098b015f1
2014-05-08 17:30:22 -05:00
Brad Gonzales
52c91e75c3 Omaha #3032 updated jdk to java 1.7.0_55
Change-Id: If1bcb03386aec265196cf8133a3f1e6b34eb1fc8

Former-commit-id: 286cecb8fb [formerly ad464cc0da] [formerly 91f94499aa] [formerly 35f6a5ac25 [formerly 91f94499aa [formerly 49cc6d83ac5fffc3f737699ab605948fa38117db]]]
Former-commit-id: 35f6a5ac25
Former-commit-id: e7c3a113c1cfa1b639f60e13f2a8eb263f952460 [formerly f7cf5741b0]
Former-commit-id: 6bee1ed107
2014-05-08 16:15:42 -05:00
Mike Duff
69e7cfa1ed Issue #3026 - NullPointer fix, test classpath fix
Change-Id: Iabc347e51a276fd4c8beb3fd512d928f184767f1

Former-commit-id: 03a2c17f36 [formerly a6e0ed67d1] [formerly b23473ee8a] [formerly 335c02d2c6 [formerly b23473ee8a [formerly 8e70b7ae1eef7a18ddffa6d6c88d10bdd0043bcc]]]
Former-commit-id: 335c02d2c6
Former-commit-id: 66a76d720a0c13b3fdb3b03633d297e5d51e2487 [formerly 16a973372e]
Former-commit-id: 0df3f51c87
2014-05-08 15:02:54 -05:00
Lee Venable
892931b35d Merge "Issue #2060 fix auto-update errors with grids in non-map displays" into omaha_14.3.1
Former-commit-id: b6cd70f862 [formerly 319073a795] [formerly 92517d3ca2] [formerly 1496955e44 [formerly 92517d3ca2 [formerly a47409fd1673c9584c46aba496be1b7203d9c45d]]]
Former-commit-id: 1496955e44
Former-commit-id: 119a16b3db169db721207a3f9638ba432a91fdca [formerly 0b25428b04]
Former-commit-id: 0a45b07910
2014-05-08 14:47:03 -05:00
Mike Duff
3966697849 Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13

Former-commit-id: f4062cd277 [formerly 0456fd0597] [formerly 8498235fd8] [formerly 6a67638a94 [formerly 8498235fd8 [formerly 57755db0d6d77f32d64b4b569bb0af88002a23da]]]
Former-commit-id: 6a67638a94
Former-commit-id: 2876e8ca8c3ac5b87e9cb00735e694e84a5f8df9 [formerly 70c8135fde]
Former-commit-id: f49192936a
2014-05-08 14:36:54 -05:00
Nate Jensen
3084f2db9b Issue #2060 fix auto-update errors with grids in non-map displays
Change-Id: Id99693f6fd54d56a4a1255f7ee5e2308e2f5d9de

Former-commit-id: 71603c2319 [formerly 84f9cd1dc8] [formerly 3e3035b6f1] [formerly ecc5c5849f [formerly 3e3035b6f1 [formerly a139113883f69be89a0e0a771f8d6f48d3948686]]]
Former-commit-id: ecc5c5849f
Former-commit-id: dbf49869a035aa878141a00faf9086e7e8f0b3ee [formerly 6c55f4832c]
Former-commit-id: d2070f782b
2014-05-08 14:08:06 -05:00
Richard Peter
c7ed1a1a93 Omaha #1458: Remove reference to cron.properties
Change-Id: Ia77204b32b9bfcc56ae795d47cdce4ceea307b29

Former-commit-id: c4b6c6cc6e [formerly 63114b4f82] [formerly 86aea04167] [formerly 0430619d7b [formerly 86aea04167 [formerly f95bb3a43e5a445c0a43628a9ed5e11e23a6a9b2]]]
Former-commit-id: 0430619d7b
Former-commit-id: 1d72a41cca6b73062aea9ce9df36d0a583f99940 [formerly 02c77af062]
Former-commit-id: 328a48a33d
2014-05-08 12:58:49 -05:00
Ben Steffensmeier
33e1805458 Issue #3080 Fix NaN handling of SliceSample.
Former-commit-id: 7a38637fb2 [formerly 3a87fa24df] [formerly 0308147ad4] [formerly 1b6bdeac86 [formerly 0308147ad4 [formerly 9974018df428c84528cf98e9f868740accbabf58]]]
Former-commit-id: 1b6bdeac86
Former-commit-id: 883fef057790d3aff91a5945cdfc9c0bb814b3f2 [formerly 80a819f65b]
Former-commit-id: 7beb6429d4
2014-05-08 11:49:04 -05:00
Nate Jensen
c771f70e7d Merge "Issue #2726: Fix GeospatialDataGenerator NPE" into omaha_14.3.1
Former-commit-id: b415dd5c4e [formerly 3fdd5dbdd6] [formerly 8f8ac40c44] [formerly d4fef60be1 [formerly 8f8ac40c44 [formerly 34d2d296f304cd84a8105993803ca35c484c6b6e]]]
Former-commit-id: d4fef60be1
Former-commit-id: a27e3174303ab185af39074281bca050c97c43f0 [formerly 04e906f1a6]
Former-commit-id: a50afc30eb
2014-05-08 10:19:43 -05:00
Richard Peter
a65504b301 Issue #2726: Fix GeospatialDataGenerator NPE
Change-Id: I07213e17fcbbadea9a33471c390bb07472ba31e0

Former-commit-id: 469f2771c3 [formerly 5a7c78c009] [formerly 24539708f9] [formerly 4d99d25a55 [formerly 24539708f9 [formerly fdc542df454887a48f4a55ef6ea9594ff98b3345]]]
Former-commit-id: 4d99d25a55
Former-commit-id: 3612a21996e81b3e6f673f5982a4a6b310ad9022 [formerly 29a8db5216]
Former-commit-id: 3c21c1042f
2014-05-08 10:14:30 -05:00
Steve Harris
bfd8f9b971 Omaha #3085 - re-deleted stuff that was re-added in a variety of ways.
Former-commit-id: 9b4b0d5c01 [formerly a804a071c0] [formerly ce2b030743] [formerly ff4a6b8122 [formerly ce2b030743 [formerly 241ca845ebcce8426bf61d730baa5e97a7762381]]]
Former-commit-id: ff4a6b8122
Former-commit-id: 12b7c2d1dfdafd204880707993afeebf47eefe41 [formerly 988ad59a0d]
Former-commit-id: 532b861bce
2014-05-08 09:50:34 -05:00
Nate Jensen
69e5254ffc Merge "Omaha #3093 Improvements to hprof tool: spelling fixes, allow grid memory >2GB, output for radar memory troubleshooting." into omaha_14.4.1
Former-commit-id: 733740f64f [formerly 8365e5aa56] [formerly 51608c090e] [formerly 4851989a7a [formerly 51608c090e [formerly 3d76d2510d7a0b96f3d8800e2c46727d08ad1fa6]]]
Former-commit-id: 4851989a7a
Former-commit-id: 696b95dfa5cc5aea77b8658c36e4e32bb84db5f9 [formerly 80d97584d3]
Former-commit-id: 6a71446d52
2014-05-08 09:36:04 -05:00
Richard Peter
899b8ce879 Omaha #1458: Break-out cron.properties.
Change-Id: I8d0cdafe812c42158ce38cdb3903737693b6f528

Former-commit-id: ab64a3e814 [formerly ad3f6c4af3] [formerly 6469ae94ed] [formerly 348bc25760 [formerly 6469ae94ed [formerly 5954c321f38ba64d305c15270b12289fb34ccdff]]]
Former-commit-id: 348bc25760
Former-commit-id: a327ca6aece2679db79622f22c10369b6cebc586 [formerly 95488f49b1]
Former-commit-id: c9d8bfdd06
2014-05-08 09:18:49 -05:00
Richard Peter
e3e1298591 Omaha #2782: Update thread based logging
Change-Id: Ifec2b15741c0fb4fa97e3c17659ddb80b69c47a8

Former-commit-id: 731f55d574 [formerly 242716fb0f] [formerly fbc4428b8c610d5f30f8d66655122d6b8da482af [formerly d5ec01f7c0]] [formerly adff7b5684 [formerly d5ec01f7c0 [formerly fe464020d287bbf21b7bc04402d31c97114c195b]]]
Former-commit-id: adff7b5684
Former-commit-id: a8128262c0240c076be7f2d7613f15608d925c72 [formerly 7a7b65860b]
Former-commit-id: 741710881f
2014-05-08 09:06:31 -05:00
Steve Harris
f1032ccc05 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIFieldConverter.java
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Cape.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Dcape.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Filter.py
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
	edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml

Former-commit-id: 03908ba8ae [formerly ddd6e35478] [formerly e37e40ed19] [formerly b7a1bda98c [formerly e37e40ed19 [formerly 396a7cbfefed07cd25e4f8b1f028c566a06e4065]]]
Former-commit-id: b7a1bda98c
Former-commit-id: d3c134610c7a2e642c723287f1d8135b292eb22c [formerly 9591532ffd]
Former-commit-id: 7a7c1167c2
2014-05-07 16:01:53 -05:00
Nate Jensen
5289cdf95c Issue #2060 fix grid updates and performance
Change-Id: I0937d7360e456f08fb613be547f7b488ebe05b50

Former-commit-id: c41e84630c [formerly c71edb2d4c] [formerly e39378e5f0] [formerly acfbce58d1 [formerly e39378e5f0 [formerly a430e85f283b3e41b8520d241f675eff3c6c32e3]]]
Former-commit-id: acfbce58d1
Former-commit-id: 18c8713f5f8a78687f4fbd908e1803323d6f2ff0 [formerly 5099fd6463]
Former-commit-id: 81b914ad9f
2014-05-07 15:30:13 -05:00
Dave Hladky
af478efa5d Issue #2940 More filenames printed, null from bad rec.
Former-commit-id: e40c9a7be8 [formerly cd4921b35f] [formerly a2ef100bfc] [formerly dadc604ab3 [formerly a2ef100bfc [formerly 26bfd426965d208f92bcb1fcd650b5f2299724a4]]]
Former-commit-id: dadc604ab3
Former-commit-id: 30f08e0872c7bff47d05e441f1dd1375d4fa9d03 [formerly f54cbb83a1]
Former-commit-id: e58fa39adc
2014-05-07 14:51:38 -05:00
Everett Kladstrup
a472cd5363 Omaha #3133 Remove some unecessary dependencies
* Remove viz.core dependency from uf.common.ohd
* Remove org.osgi.framework dependency from uf.edex.ndm
* Remove non-existant activator from uf.edex.ndm manifest


Former-commit-id: 4ea3156453 [formerly 516a50a6a1] [formerly 3a00185e3c] [formerly b4a76a575a [formerly 3a00185e3c [formerly ce1379d30d26f96959dc07d8a7f3a1fc3d355c99]]]
Former-commit-id: b4a76a575a
Former-commit-id: 0b36cc357c9ac92e1860eb4bdfa5b01916468b94 [formerly ce743b3c43]
Former-commit-id: a1070cc1ac
2014-05-07 12:54:37 -05:00
Nate Jensen
e979a3caeb Issue #2060 log successful sat precip file creation
Change-Id: I40df627645e0c0e089609f8dcc56b8351a4c56f1

Former-commit-id: a66c157399 [formerly 3c1f9693f2] [formerly f06c77f5ad] [formerly 170106ad44 [formerly f06c77f5ad [formerly b3158ae940ab59a7a96b4650f0f956c82b0c9d49]]]
Former-commit-id: 170106ad44
Former-commit-id: 29afb4d86748112fab5054cd93607ac60cb3b546 [formerly af426cf278]
Former-commit-id: 40b5e501a2
2014-05-07 09:44:20 -05:00
Ben Steffensmeier
efd43c399e Omaha #3093 Improvements to hprof tool: spelling fixes, allow grid memory >2GB, output for radar memory troubleshooting.
Former-commit-id: 5a52d61636 [formerly 462ec63608] [formerly 18ec643a30] [formerly 973c6fdb55 [formerly 18ec643a30 [formerly 3bd0a076add20c38fad41461295fb430e8ceb5cb]]]
Former-commit-id: 973c6fdb55
Former-commit-id: 458e8bf278ed316f4bc7434b69cdf0bf5245ba6c [formerly 0bd28752bc]
Former-commit-id: 3e9e6abde2
2014-05-06 18:06:44 -05:00
Nate Jensen
02be49d972 Merge "Issue #3101 fix some derived parameters on win64 platform" into omaha_14.3.1
Former-commit-id: 7193103faf [formerly be75956418] [formerly ddb3610e24] [formerly 69b6c9426f [formerly ddb3610e24 [formerly 31d9df701d689ceaf76c9d241d36df5c9c463bb3]]]
Former-commit-id: 69b6c9426f
Former-commit-id: d847d191e396a392b956f225e997154b5bd29006 [formerly 7360ee5c1a]
Former-commit-id: f2e1ee0aeb
2014-05-06 17:29:45 -05:00
Nate Jensen
1adf6d304f Merge "Issue #3117 update satellite inventory for new sectors or elements." into omaha_14.3.1
Former-commit-id: e93e248f9a [formerly daac0701fc] [formerly d271dfb1a5] [formerly 0f1cab916a [formerly d271dfb1a5 [formerly 37c2d25d9ff0076d1cab4f818e45c6ccead82105]]]
Former-commit-id: 0f1cab916a
Former-commit-id: 47226b181942be9b2bff4189674708a517376408 [formerly 70f70371b1]
Former-commit-id: 89621db281
2014-05-06 17:09:56 -05:00