Nate Jensen
|
04ab5c3876
|
Omaha #3133 remove unused uf.common.cache from alertviz feature
Change-Id: Ib4a36a727e8b26a708f247e6263518786cc60832
Former-commit-id: d17505de35 [formerly bab916f2be] [formerly 68c8238275] [formerly d17505de35 [formerly bab916f2be] [formerly 68c8238275] [formerly 5eaa5d7b0e [formerly 68c8238275 [formerly e659b393f23e5e999c2b03ddad648f2748ee97e9]]]]
Former-commit-id: 5eaa5d7b0e
Former-commit-id: fe89471076 [formerly e8661182d0] [formerly f3445e11c9785ba8cfce7da200af30902b11db17 [formerly 2a6d25cf41]]
Former-commit-id: 39075eff029cf41fbb88f9bef28e481085f20447 [formerly 437d400966]
Former-commit-id: 5da8849cf5
|
2014-05-13 17:52:12 -05:00 |
|
Nate Jensen
|
14c3cb008b
|
Omaha #3133 remove uf.common.monitor's dependency on org.eclipse.swt
Change-Id: I362c5c2ece96e77a0cce5af7ac75a403c95ab851
Former-commit-id: 11db335c3a [formerly e464500dfc] [formerly 07426ce408] [formerly 11db335c3a [formerly e464500dfc] [formerly 07426ce408] [formerly 174fae77d1 [formerly 07426ce408 [formerly b842a78cdfb945767aecf7da3ad55b71c9d09bfb]]]]
Former-commit-id: 174fae77d1
Former-commit-id: 5b8f3aada2 [formerly c31080d705] [formerly 59ddbe2030bf3ffb614a1ba31e37cfb021339cfb [formerly ea7b123eef]]
Former-commit-id: d3e19b5f43cade3b4e741900facacc51b5142159 [formerly 4a18f1e24b]
Former-commit-id: 824c2f805d
|
2014-05-13 13:12:54 -05:00 |
|
Nate Jensen
|
fd67356371
|
Omaha #3133 remove edex dependencies from common.monitor plugin
Change-Id: Iea84cdadc86b9bb137bc2e34d546e51f9978d5e3
Former-commit-id: ec4768ed4b [formerly 88535c69f5] [formerly cc86f19bad] [formerly ec4768ed4b [formerly 88535c69f5] [formerly cc86f19bad] [formerly b05630b171 [formerly cc86f19bad [formerly d25e1bee210a084e17d4ee781eddb42c14735140]]]]
Former-commit-id: b05630b171
Former-commit-id: a057e5389c [formerly 5d099a3b4b] [formerly b39b5e72eb5dbb60bd6eb1dd766f167f0f6d7044 [formerly 3aff81313f]]
Former-commit-id: a18a00cd7490110d905197692cdd5acc993d45ba [formerly 363b019ceb]
Former-commit-id: dc2ac6e07b
|
2014-05-12 16:46:06 -05:00 |
|
Steve Harris
|
32c6a48a39
|
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 856f5bc3b7 [formerly b3bc71c8a4] [formerly 652fb19bc4] [formerly 6964df0664 [formerly 652fb19bc4 [formerly a20833879f1a0434c562a22a874b1e1722278954]]]]
Former-commit-id: 6964df0664
Former-commit-id: 7f7e8e69a4 [formerly 77b2da7a4f] [formerly 9655787e1bc6f95e4e9dab9054aa147d706bdd37 [formerly 661eceea83]]
Former-commit-id: 343ac38383e296e3ae1f421f8cf6238df294b55b [formerly d33fbe7c31]
Former-commit-id: ae3bc184ce
|
2014-05-12 15:05:43 -05:00 |
|
Nate Jensen
|
cf95cc9b33
|
Merge "Omaha #3075 updates for pydev 3.4.1" into omaha_14.4.1
Former-commit-id: 17d9ff2607 [formerly 650edc41f3] [formerly eff5a8e32f] [formerly 17d9ff2607 [formerly 650edc41f3] [formerly eff5a8e32f] [formerly ab064743f4 [formerly eff5a8e32f [formerly a213a01ac89bf84a6a0d4dfea44073cb0b2a7fce]]]]
Former-commit-id: ab064743f4
Former-commit-id: baa755e914 [formerly c57623dc52] [formerly 94b65ff379509fa2a8147231bb03f64db8b50e59 [formerly 7afd18662d]]
Former-commit-id: d744b72f28ffbd07ba53b2c757123a9836e68dd1 [formerly 25216d1a2f]
Former-commit-id: 8b8cb81410
|
2014-05-12 11:56:34 -05:00 |
|
Bryan Kowal
|
722ea7e67a
|
Issue #3026 - remove unnecessary hpe ffmp dependency
Former-commit-id: 163a517f0a [formerly 8f16f25cd7] [formerly 6e6a6a73ee] [formerly 163a517f0a [formerly 8f16f25cd7] [formerly 6e6a6a73ee] [formerly faa6b09ac9 [formerly 6e6a6a73ee [formerly c94c973ef6a663f93a6b1a6301f5553d4e88ac73]]]]
Former-commit-id: faa6b09ac9
Former-commit-id: cf491026b0 [formerly 9153d61b90] [formerly d118ff248800b223cac6d3532aa23ae410ceee1c [formerly 5f5987f57b]]
Former-commit-id: 234823b432ef08daec6a41228720df14f273fd48 [formerly 31d2290415]
Former-commit-id: 1578a42992
|
2014-05-12 11:46:35 -05:00 |
|
Nate Jensen
|
2df8a30b14
|
Omaha #3075 updates for pydev 3.4.1
Change-Id: I2d7ed5e73f837f42dea3de35cdf79dd98c7586b1
Former-commit-id: 7e3a38d473 [formerly 5fcc126e57] [formerly e6569b4a7d] [formerly 7e3a38d473 [formerly 5fcc126e57] [formerly e6569b4a7d] [formerly bb32858c04 [formerly e6569b4a7d [formerly a038aea9bb25e31b29b054e8899c0b51bc183fef]]]]
Former-commit-id: bb32858c04
Former-commit-id: b4747e1967 [formerly 651ce74777] [formerly 1c3c85d7dc8e6b4c5d374cb39021ba2a71dac98c [formerly 5d08184312]]
Former-commit-id: 1ecaca6a168a620d74a23e94527430feab94ee01 [formerly 9713ae6bf1]
Former-commit-id: 064894fe59
|
2014-05-09 16:45:39 -05:00 |
|
Brian Clements
|
693be79b38
|
Omaha #3107 added timeout handling logic for leader transfer verification
Former-commit-id: 7db361813c [formerly 26d206f780] [formerly 08a406ff18] [formerly 7db361813c [formerly 26d206f780] [formerly 08a406ff18] [formerly 7b7bc5be97 [formerly 08a406ff18 [formerly 294a489ba547bf90df9d6b6a5107c8993c5b8333]]]]
Former-commit-id: 7b7bc5be97
Former-commit-id: 87d24b248b [formerly 98e74677fd] [formerly 420481d439ea6530a366a6c1534bebf4d5ede131 [formerly 3d3d7f04bb]]
Former-commit-id: dc3be633fa9ff1642c27fe62a48e3c3cea46614e [formerly 5e739b598c]
Former-commit-id: 415ff47d51
|
2014-05-09 15:43:46 -05:00 |
|
Lee Venable
|
a26966b107
|
Merge "Issue #3145 - Fix Scan threat labels, dispose font" into omaha_14.3.1
Former-commit-id: bb5cc2c9ac [formerly cd5956d21a] [formerly 364f0d877a] [formerly bb5cc2c9ac [formerly cd5956d21a] [formerly 364f0d877a] [formerly e3c6407be3 [formerly 364f0d877a [formerly 06b3cb4dd8f07600e6513a15a2495b485b0812b6]]]]
Former-commit-id: e3c6407be3
Former-commit-id: 0fc85255e4 [formerly a46987ef36] [formerly c5990d4401145dd3609123f0dd6741e9a15c26ae [formerly b06e8e6e3e]]
Former-commit-id: f1e762a37c388902d6115e2fd3f7522b258d9e24 [formerly d23ba206c9]
Former-commit-id: fb58021364
|
2014-05-09 11:14:51 -05:00 |
|
Mike Duff
|
fb42111c6f
|
Issue #3145 - Fix Scan threat labels, dispose font
Change-Id: I385e184d81a021a350c7df7ee4948ad7e407784d
Former-commit-id: 279dd3dbad [formerly 158fb46b9f] [formerly 03356dd554] [formerly 279dd3dbad [formerly 158fb46b9f] [formerly 03356dd554] [formerly a81569849b [formerly 03356dd554 [formerly 84bd0800b2652b31c06015fa49f816f1402f461d]]]]
Former-commit-id: a81569849b
Former-commit-id: 4d00418164 [formerly 456038d161] [formerly 9842522c95a5493559d096bac98243e002212bfa [formerly 4ec26b6e31]]
Former-commit-id: 51810eecf351cd58e7502b561c71bf23d6c392e4 [formerly 32f6ad40ec]
Former-commit-id: e4e8e0fe8e
|
2014-05-09 10:32:04 -05:00 |
|
Nate Jensen
|
eda42bf1ce
|
Merge "Issue #3026 - feature.xml fix" into omaha_14.3.1
Former-commit-id: 3330d7e72d [formerly d0d20849b6] [formerly 575360192a] [formerly 3330d7e72d [formerly d0d20849b6] [formerly 575360192a] [formerly e8c4279d10 [formerly 575360192a [formerly 25e500435693940e378df086739fce8eefdba3bb]]]]
Former-commit-id: e8c4279d10
Former-commit-id: f15db04d4f [formerly e0365dd4a3] [formerly 0b7be915c239ef7a407a8fcd6ca62efe41a54d6d [formerly 95ca77688a]]
Former-commit-id: c09794a593028767668796108549b63ebd3664fe [formerly 191d3a0d06]
Former-commit-id: db6d756ffd
|
2014-05-09 09:53:25 -05:00 |
|
Mike Duff
|
433c3e5870
|
Issue #3026 - feature.xml fix
Change-Id: I07d5043a8c968fa841f4e94eee47617e018ea794
Former-commit-id: 53d81818d3 [formerly 7e996909d1] [formerly 78f2a26903] [formerly 53d81818d3 [formerly 7e996909d1] [formerly 78f2a26903] [formerly 038b2b7500 [formerly 78f2a26903 [formerly a44e412190741fcb0a91dd451ae538277ae0d79f]]]]
Former-commit-id: 038b2b7500
Former-commit-id: b8696720cd [formerly b73e635162] [formerly a4741aa0a763cbbf63af15c647cd18f0d20c6fd6 [formerly c7f5379b78]]
Former-commit-id: f790e152dd4e3d3ff28d723c849c82663943c0fd [formerly 25638a5b40]
Former-commit-id: c984973464
|
2014-05-09 09:27:10 -05:00 |
|
Ben Steffensmeier
|
dd8846091f
|
Issue #2920 Fix default color of BOXED text.
Former-commit-id: ee99dba933 [formerly 60479824d1] [formerly 87ea43cf0d] [formerly ee99dba933 [formerly 60479824d1] [formerly 87ea43cf0d] [formerly 9d4c33ba91 [formerly 87ea43cf0d [formerly 59f12cd4cc60f0908c106cbc0572d3f84d0d509b]]]]
Former-commit-id: 9d4c33ba91
Former-commit-id: ad64b8b197 [formerly 082a5c515d] [formerly faee1aa6dd05debf6ff2f60a54d18fa91ba9f91e [formerly 199a2df79e]]
Former-commit-id: 12720115fd4f8d9e4e99d1304dadb73ecc9e8f71 [formerly 2b4d783fd7]
Former-commit-id: f0c4cc03a0
|
2014-05-08 18:18:08 -05:00 |
|
Mike Duff
|
f924c12ec6
|
Issue #3026 - NullPointer fix, test classpath fix
Change-Id: Iabc347e51a276fd4c8beb3fd512d928f184767f1
Former-commit-id: 03a2c17f36 [formerly a6e0ed67d1] [formerly b23473ee8a] [formerly 03a2c17f36 [formerly a6e0ed67d1] [formerly b23473ee8a] [formerly 335c02d2c6 [formerly b23473ee8a [formerly 8e70b7ae1eef7a18ddffa6d6c88d10bdd0043bcc]]]]
Former-commit-id: 335c02d2c6
Former-commit-id: 69e7cfa1ed [formerly 0df3f51c87] [formerly 66a76d720a0c13b3fdb3b03633d297e5d51e2487 [formerly 16a973372e]]
Former-commit-id: 5303ea642886a0d2399938a4719d496c60301888 [formerly 1dc95cf8de]
Former-commit-id: 718fc22e25
|
2014-05-08 15:02:54 -05:00 |
|
Lee Venable
|
1f7df07379
|
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 b6cd70f862 [formerly 319073a795] [formerly 92517d3ca2] [formerly 1496955e44 [formerly 92517d3ca2 [formerly a47409fd1673c9584c46aba496be1b7203d9c45d]]]]
Former-commit-id: 1496955e44
Former-commit-id: 892931b35d [formerly 0a45b07910] [formerly 119a16b3db169db721207a3f9638ba432a91fdca [formerly 0b25428b04]]
Former-commit-id: 2b7f8d7ee26b23e61bb5beb3148f45bc926cc808 [formerly 0075d2a450]
Former-commit-id: 70e31865be
|
2014-05-08 14:47:03 -05:00 |
|
Mike Duff
|
8904d8a501
|
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 f4062cd277 [formerly 0456fd0597] [formerly 8498235fd8] [formerly 6a67638a94 [formerly 8498235fd8 [formerly 57755db0d6d77f32d64b4b569bb0af88002a23da]]]]
Former-commit-id: 6a67638a94
Former-commit-id: 3966697849 [formerly f49192936a] [formerly 2876e8ca8c3ac5b87e9cb00735e694e84a5f8df9 [formerly 70c8135fde]]
Former-commit-id: 79e94a80e7729225dba251b67e17c3517adc7fc5 [formerly 916d90ee64]
Former-commit-id: 4adf657556
|
2014-05-08 14:36:54 -05:00 |
|
Nate Jensen
|
4371f25d2f
|
Issue #2060 fix auto-update errors with grids in non-map displays
Change-Id: Id99693f6fd54d56a4a1255f7ee5e2308e2f5d9de
Former-commit-id: 71603c2319 [formerly 84f9cd1dc8] [formerly 3e3035b6f1] [formerly 71603c2319 [formerly 84f9cd1dc8] [formerly 3e3035b6f1] [formerly ecc5c5849f [formerly 3e3035b6f1 [formerly a139113883f69be89a0e0a771f8d6f48d3948686]]]]
Former-commit-id: ecc5c5849f
Former-commit-id: 3084f2db9b [formerly d2070f782b] [formerly dbf49869a035aa878141a00faf9086e7e8f0b3ee [formerly 6c55f4832c]]
Former-commit-id: 3c69ed9e2d78d7ce30d54845811924f5c2bf2483 [formerly 93f71ec65c]
Former-commit-id: 1dc7cc875e
|
2014-05-08 14:08:06 -05:00 |
|
Steve Harris
|
a7c453801c
|
Omaha #3085 - re-deleted stuff that was re-added in a variety of ways.
Former-commit-id: 9b4b0d5c01 [formerly a804a071c0] [formerly ce2b030743] [formerly 9b4b0d5c01 [formerly a804a071c0] [formerly ce2b030743] [formerly ff4a6b8122 [formerly ce2b030743 [formerly 241ca845ebcce8426bf61d730baa5e97a7762381]]]]
Former-commit-id: ff4a6b8122
Former-commit-id: bfd8f9b971 [formerly 532b861bce] [formerly 12b7c2d1dfdafd204880707993afeebf47eefe41 [formerly 988ad59a0d]]
Former-commit-id: 14bc990e4d26f4fcba9b4f047441d279289dbc89 [formerly 47991060bb]
Former-commit-id: 77030c2fc3
|
2014-05-08 09:50:34 -05:00 |
|
Steve Harris
|
36a5745de6
|
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 03908ba8ae [formerly ddd6e35478] [formerly e37e40ed19] [formerly b7a1bda98c [formerly e37e40ed19 [formerly 396a7cbfefed07cd25e4f8b1f028c566a06e4065]]]]
Former-commit-id: b7a1bda98c
Former-commit-id: f1032ccc05 [formerly 7a7c1167c2] [formerly d3c134610c7a2e642c723287f1d8135b292eb22c [formerly 9591532ffd]]
Former-commit-id: fab7d30fa99a5cbb15284899c9cda059f1e07992 [formerly 049716e54d]
Former-commit-id: 2b29fec8d6
|
2014-05-07 16:01:53 -05:00 |
|
Nate Jensen
|
e98ed9042a
|
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 e93e248f9a [formerly daac0701fc] [formerly d271dfb1a5] [formerly 0f1cab916a [formerly d271dfb1a5 [formerly 37c2d25d9ff0076d1cab4f818e45c6ccead82105]]]]
Former-commit-id: 0f1cab916a
Former-commit-id: 1adf6d304f [formerly 89621db281] [formerly 47226b181942be9b2bff4189674708a517376408 [formerly 70f70371b1]]
Former-commit-id: 2f4818061c868c793957c6720b9ab0b1d1c1a29f [formerly 12f88d14bf]
Former-commit-id: 76750c319a
|
2014-05-06 17:09:56 -05:00 |
|
Ben Steffensmeier
|
41fead7d98
|
Issue #3117 update satellite inventory for new sectors or elements.
Former-commit-id: 34c4ce1630 [formerly e70a6999b7] [formerly bbbf957ba8] [formerly 34c4ce1630 [formerly e70a6999b7] [formerly bbbf957ba8] [formerly 70df0ee87e [formerly bbbf957ba8 [formerly 35845fa63be35661893d31510f83e2d9ab6f60af]]]]
Former-commit-id: 70df0ee87e
Former-commit-id: c83559ee61 [formerly 81916ecdb6] [formerly 4e4ce9614076e1c738d79e3feab9658310edbcb5 [formerly 945fe1db2f]]
Former-commit-id: 0e99b439ffe3cb3eb47009242d3ff465ec38fa5e [formerly a39b05ac71]
Former-commit-id: b978e0fc1d
|
2014-05-06 16:19:58 -05:00 |
|
Nate Jensen
|
fb64a8684f
|
Merge "Issue #3076 added clear all to shared display sessions" into omaha_14.3.1
Former-commit-id: 0b046a18e1 [formerly 26f47e3b00] [formerly a583493711] [formerly 0b046a18e1 [formerly 26f47e3b00] [formerly a583493711] [formerly 8f8ea5d014 [formerly a583493711 [formerly 26eb2500104f7afe3fb07ddd66299aa1486375d2]]]]
Former-commit-id: 8f8ea5d014
Former-commit-id: baf8e4a3ea [formerly 4f3570324a] [formerly 532ed751ce54ccf8c69036528d3a9d6ed5bdb7dd [formerly f1c48f10b1]]
Former-commit-id: 7e9a62127f91ff74917a295a5da19fae49aff58f [formerly a20245a64d]
Former-commit-id: 3aa1481c98
|
2014-05-06 16:15:41 -05:00 |
|
Nate Jensen
|
8a31b5edf5
|
Issue #2060 fill in units on GridRecords created from URIs
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a
Former-commit-id: 1d38804eb2 [formerly 3719c41d2b] [formerly 71b4227061] [formerly 1d38804eb2 [formerly 3719c41d2b] [formerly 71b4227061] [formerly 7cea97ab15 [formerly 71b4227061 [formerly 949d132cf3260db5f75ea665f21601ab91440958]]]]
Former-commit-id: 7cea97ab15
Former-commit-id: e8ca9729eb [formerly 5bf1554597] [formerly 4cf3887df369f38b75f0a2c9f9f7949057e50e42 [formerly 6bdbfb7e1a]]
Former-commit-id: 0fc7bbac68e600996cc014bbf843e66d5484e6e9 [formerly 66cd43313a]
Former-commit-id: ad7a69f2e3
|
2014-05-06 12:26:21 -05:00 |
|
Brian Clements
|
8bb6a1ac40
|
Issue #3076 added clear all to shared display sessions
Former-commit-id: 02c921ed12 [formerly 729e717be1] [formerly f545c548cc] [formerly 02c921ed12 [formerly 729e717be1] [formerly f545c548cc] [formerly 1432aa1302 [formerly f545c548cc [formerly 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb]]]]
Former-commit-id: 1432aa1302
Former-commit-id: 0fbb5dc22a [formerly 8674841154] [formerly bcb942f3e18364de413f94465a2f8a874c91dc8e [formerly 5583c3903b]]
Former-commit-id: db57e64f5cb253ecb97388555bf76c0cac27eaf9 [formerly 3a60b0db05]
Former-commit-id: 89f3a0a1d2
|
2014-05-06 09:30:07 -05:00 |
|
Nate Jensen
|
83f9d6e4e9
|
Merge "Omaha #3061 only shared display capable clients get payload in invite" into omaha_14.4.1
Former-commit-id: c07a4c0069 [formerly db4fc0c4d2] [formerly 7d11e31b06] [formerly c07a4c0069 [formerly db4fc0c4d2] [formerly 7d11e31b06] [formerly 596b5268d0 [formerly 7d11e31b06 [formerly dee25d151cecf83f23d2ef9df20146c68069e957]]]]
Former-commit-id: 596b5268d0
Former-commit-id: 7cec722176 [formerly bff03681a4] [formerly a4dee39f1add48e8c979182cd8f3f9ee04f952a5 [formerly bad26fdd7d]]
Former-commit-id: 559d76fcf8298b702f134557f213fd1dd0db1c11 [formerly 7e521c3e0b]
Former-commit-id: c32e1bb9fe
|
2014-05-05 16:58:44 -05:00 |
|
Lee Venable
|
4a44bbed48
|
Issue #3109 - removed code that sets the Cave cursor.
Change-Id: I1d6d640c5abafffdea29f1e2e835142fe6598470
Former-commit-id: a57f0e338d [formerly 550668cbf7] [formerly a6c2260dd1] [formerly a57f0e338d [formerly 550668cbf7] [formerly a6c2260dd1] [formerly b0a251f4e3 [formerly a6c2260dd1 [formerly d875f73ff44986b2c7862f0dee06504d576fd96b]]]]
Former-commit-id: b0a251f4e3
Former-commit-id: a8864844bb [formerly a092fd45dc] [formerly 99c525ad61eed1107476ce09523a10adfb16b511 [formerly 631a8d3cb1]]
Former-commit-id: d050d7aa9271504d20368a3a4fa3054d4a97cc2d [formerly f48d571cb6]
Former-commit-id: 46eb74e982
|
2014-05-05 16:13:31 -05:00 |
|
Steve Harris
|
3eb4392746
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts (updated in ufcore):
cave/com.raytheon.uf.viz.application.feature/feature.xml
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLShadedShapeBase.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.derivparam.python/src/com/raytheon/uf/common/derivparam/python/MasterDerivScript.java
edexOsgi/com.raytheon.uf.common.time/utility/common_static/base/python/time/DataTime.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/SessionManagedDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
Former-commit-id: dd01a4282b [formerly a8d3f4d885] [formerly 73ed3251bd] [formerly dd01a4282b [formerly a8d3f4d885] [formerly 73ed3251bd] [formerly 83368e4b4e [formerly 73ed3251bd [formerly e26c8f0a5c62444d7ada1cfa7a15cb463a4b5285]]]]
Former-commit-id: 83368e4b4e
Former-commit-id: 7245029570 [formerly ea24d1dadc] [formerly 2b3b76c82538d382ce6a14c9e014860eb6ff65e2 [formerly caadbd3dd9]]
Former-commit-id: df9b11e0eb39b9514f40f87773a3af9916ea3bf3 [formerly 8cd5ed7a8e]
Former-commit-id: b8b5300a9b
|
2014-05-05 16:04:09 -05:00 |
|
Brian Clements
|
eae39a09dd
|
Omaha #3061 only shared display capable clients get payload in invite
Former-commit-id: 46b526473d [formerly dec5159216] [formerly 1502354f87] [formerly 46b526473d [formerly dec5159216] [formerly 1502354f87] [formerly c61e30a422 [formerly 1502354f87 [formerly 6595f5be37941f35c33b46231deef7d41e967380]]]]
Former-commit-id: c61e30a422
Former-commit-id: 89fbf5f2bc [formerly 9d25e9dcb8] [formerly 0a74f9c3259a55c56b2763cb02f26aae56e52755 [formerly 58f45fa7d0]]
Former-commit-id: f75d4b4a4fb7e74481dd87fffc4dde55585c4782 [formerly 1e3d29a3f3]
Former-commit-id: 9c7f4cd887
|
2014-05-05 15:29:06 -05:00 |
|
Dave Hladky
|
766d9f09a7
|
Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1
Conflicts:
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java
Former-commit-id: 7d244313a5 [formerly 0ac4de6ad0] [formerly 333bf8b36d] [formerly 7d244313a5 [formerly 0ac4de6ad0] [formerly 333bf8b36d] [formerly ccaaa1cfea [formerly 333bf8b36d [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]]]
Former-commit-id: ccaaa1cfea
Former-commit-id: d9243205e4 [formerly 93ca9cfe6a] [formerly 407941b24c780437890a6937639d0d55a05f02fd [formerly 7611339cd8]]
Former-commit-id: 1470be2678cc30858e885d64731cb2816e28e3ab [formerly cb94f9fc97]
Former-commit-id: 7e763a5a22
|
2014-05-05 12:15:14 -05:00 |
|
Nate Jensen
|
ef530e538d
|
Merge "Issue #2956 more safety checks" into omaha_14.3.1
Former-commit-id: a2607513bf [formerly f233d104d7] [formerly e9b3041170] [formerly a2607513bf [formerly f233d104d7] [formerly e9b3041170] [formerly d6518bede1 [formerly e9b3041170 [formerly c4d06eea732629d5fac66593269ec82b9ee6463d]]]]
Former-commit-id: d6518bede1
Former-commit-id: dcbedcbbc0 [formerly e8e971d434] [formerly bd03fd08ecba17789cb90578917e1a4d7b88234a [formerly 8ee8937daf]]
Former-commit-id: 691f6074396a107be1d2cd9bbea9d5f5ba7b2d31 [formerly e8b7cec960]
Former-commit-id: 3eaaf56f8e
|
2014-05-05 09:45:11 -05:00 |
|
Richard Peter
|
6b93ff149a
|
Merge "Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change" into omaha_14.3.1
Former-commit-id: aeebf17373 [formerly 4e1bc16d70] [formerly 478cedd3a3] [formerly aeebf17373 [formerly 4e1bc16d70] [formerly 478cedd3a3] [formerly d4a138c534 [formerly 478cedd3a3 [formerly f124cee1070a3dd0e09cb54f773f63095f18bd16]]]]
Former-commit-id: d4a138c534
Former-commit-id: 4537e1276f [formerly 160ce06137] [formerly ca0cfca3ed26cc4f000b74ac3d1f482f80140ed2 [formerly 1b7dd13525]]
Former-commit-id: 1d7a263d7bb684e35dafbb6c76df324cb708edde [formerly 67eb0867ea]
Former-commit-id: 7481634fdb
|
2014-05-02 09:50:40 -05:00 |
|
Richard Peter
|
711be53fea
|
Issue #2854: Pack commons.lang for alertviz
Change-Id: Ib6eb59c6cbdb5b52acc051aec4339445fdc14166
Former-commit-id: 36d579c206 [formerly 1738b065b8] [formerly a9b088146c] [formerly 36d579c206 [formerly 1738b065b8] [formerly a9b088146c] [formerly bcd87195ee [formerly a9b088146c [formerly 7d69b9fdc60b0c07121eab0119cf45b1624653cd]]]]
Former-commit-id: bcd87195ee
Former-commit-id: 2d597d61ab [formerly 926cd5f6d1] [formerly 3fa1d18ae07b1ff8c4ffc4b83cd39952d11ded1d [formerly e1a2767f8f]]
Former-commit-id: 4fe9ed9b053941aaa7d97f487449c7e8441c5f10 [formerly df422d1516]
Former-commit-id: 338b2c53d0
|
2014-05-01 16:30:21 -05:00 |
|
Nate Jensen
|
2b6ad3264c
|
Issue #2956 more safety checks
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e
Former-commit-id: 54c6d5d07f [formerly d759efcaa8] [formerly f4d20c41f4] [formerly 54c6d5d07f [formerly d759efcaa8] [formerly f4d20c41f4] [formerly 7d142d9d9d [formerly f4d20c41f4 [formerly a24190f35b87351a5f699ac05041bec7a13a1cdb]]]]
Former-commit-id: 7d142d9d9d
Former-commit-id: 9f08442039 [formerly 6f211aa9f8] [formerly fb99f58ad5a7cfb43ae453f0c000e943ba999928 [formerly f3b68178bd]]
Former-commit-id: 930f4906645edbcafbe567a1652cb392d52f18a5 [formerly 3f9a33bf35]
Former-commit-id: 42a27546f9
|
2014-05-01 16:28:16 -05:00 |
|
Nate Jensen
|
e2a024ea00
|
Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change
Change-Id: I25bd1305568d26940b69565f53a06661955f240b
Former-commit-id: 8d5ec4bb04 [formerly 3222914fde] [formerly 137818d03a] [formerly 8d5ec4bb04 [formerly 3222914fde] [formerly 137818d03a] [formerly a73a310709 [formerly 137818d03a [formerly 6f8ef50f7cf8f245f749bf8ff9dbcc33a1d64d64]]]]
Former-commit-id: a73a310709
Former-commit-id: 834dd4895a [formerly b245e49d53] [formerly 61860d514df7120cc0bb0d8c083c115b3944aa73 [formerly 84dbedcff5]]
Former-commit-id: 48dea045c9df8e5f4f88eaca3f0e152ddc64138d [formerly c7ddb6d476]
Former-commit-id: 562a70b8fb
|
2014-05-01 16:20:35 -05:00 |
|
Richard Peter
|
d2682acaf2
|
Issue #2854: Fix features.
Change-Id: Iab5371d51b5a582387bfd9a8ef8bdd595d1dd0fe
Former-commit-id: c7f5b23633 [formerly 25fd0e03f4] [formerly 4056f53fa2] [formerly c7f5b23633 [formerly 25fd0e03f4] [formerly 4056f53fa2] [formerly a4fb460e17 [formerly 4056f53fa2 [formerly 0d675fd5b0fdb0adceef0052adaf31c1c9a7911b]]]]
Former-commit-id: a4fb460e17
Former-commit-id: 3297632b5d [formerly f364f02f58] [formerly 38c78f7ac3ebdff8190b01723125c22a2058c85f [formerly c3c7ebb146]]
Former-commit-id: 7a8980241b9c8931fec2ce1f756924532831bd95 [formerly 472077fbd5]
Former-commit-id: b8bdced87a
|
2014-05-01 14:47:41 -05:00 |
|
Steve Harris
|
059faff023
|
Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
Former-commit-id: d2905e51d4 [formerly 9ecd871825] [formerly c8ba70a146] [formerly d2905e51d4 [formerly 9ecd871825] [formerly c8ba70a146] [formerly 779e85cc77 [formerly c8ba70a146 [formerly 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8]]]]
Former-commit-id: 779e85cc77
Former-commit-id: 9a268173ac [formerly 9a6ab8c52f] [formerly bf130d4e15490de77c6bbdbae09ac7d93618c08a [formerly bdf6d0b6be]]
Former-commit-id: 787bb8f6beeae504adb25f278d73dbfbb74159fb [formerly d7c31fe4a9]
Former-commit-id: 523cf536e2
|
2014-05-01 13:25:15 -05:00 |
|
Brian Clements
|
de694643a9
|
Issue #2903 changed commons.lang to match other unpacking foss
Former-commit-id: eae19ec5ca [formerly 93912625ea] [formerly 3ca4f8cc52] [formerly eae19ec5ca [formerly 93912625ea] [formerly 3ca4f8cc52] [formerly dd5412e119 [formerly 3ca4f8cc52 [formerly ee24eaf54704dcfdf698089a8269e055f7856c80]]]]
Former-commit-id: dd5412e119
Former-commit-id: 8fc0feed89 [formerly 3fd504f1de] [formerly f6d182158a5782516e8b761f409c187bb4622b1d [formerly 2337d5ef56]]
Former-commit-id: e46f09623a9e504ef25b49b889bf64a2c46ca4bb [formerly c7cea4b5f7]
Former-commit-id: 36b2419ff1
|
2014-05-01 12:34:09 -05:00 |
|
Brian Clements
|
542b75e5be
|
Issue #2903 set commons.lang to unpack in feature to fix odd bug
collaboration gets in a state where commons.lang is no longer found
setting unpack to true might help
Former-commit-id: fe53a23d2c [formerly fee0a858cb] [formerly 873efa1c64] [formerly fe53a23d2c [formerly fee0a858cb] [formerly 873efa1c64] [formerly f45e435f2c [formerly 873efa1c64 [formerly b27a714c2cbdf2f13eb0c494ace4cbd016ef8132]]]]
Former-commit-id: f45e435f2c
Former-commit-id: 00e7061f42 [formerly 20830253ba] [formerly f9367f0487bc002acf5cc3b4733af6b6d9b49a24 [formerly c187523782]]
Former-commit-id: 1a699056f312f4be2eb1ef65d741ba8d01a416f7 [formerly c3d2b4be86]
Former-commit-id: 4c1a6b44c8
|
2014-04-30 17:52:43 -05:00 |
|
Richard Peter
|
68474fb70c
|
Merge "Issue #2992 Updated DD list of active registries Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca" into omaha_14.3.1
Former-commit-id: 83658fcbb5 [formerly d28c4fdbae] [formerly de9eb60629] [formerly 83658fcbb5 [formerly d28c4fdbae] [formerly de9eb60629] [formerly 86ddd480c1 [formerly de9eb60629 [formerly 4e6364a24d5f9354946455218cc394fbda4a11ed]]]]
Former-commit-id: 86ddd480c1
Former-commit-id: 9ee5b7c648 [formerly d961ff6edc] [formerly 75220412d93558970dc725fce5312cce7866166d [formerly 6ecb5018b6]]
Former-commit-id: f6db2a6fbbc579ddd2e876bdea84339cafc85568 [formerly dd54408a10]
Former-commit-id: cfb980db11
|
2014-04-30 17:43:50 -05:00 |
|
Dave Hladky
|
5fa53b22dc
|
Issue #2992 Updated DD list of active registries
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca
Former-commit-id: a14cb8c45f [formerly e2a4bb6755] [formerly c352643c79] [formerly a14cb8c45f [formerly e2a4bb6755] [formerly c352643c79] [formerly 3b00ae03cc [formerly c352643c79 [formerly a34955102d1316135c4151210daba0e5807ff6c9]]]]
Former-commit-id: 3b00ae03cc
Former-commit-id: 5fc17cf3b8 [formerly ea791b5ca5] [formerly 271120a82cffba35438f0b9830c3a47c736fcb73 [formerly bf42c8d740]]
Former-commit-id: 966b34bc10a6cb76f151b577b0acae7fb953d804 [formerly 5b11e45636]
Former-commit-id: a06db5a4e7
|
2014-04-30 17:38:28 -05:00 |
|
Richard Peter
|
7dbdba81ac
|
Merge "Issue #2946 Fix auxillary purge rules." into omaha_14.3.1-NHDA
Former-commit-id: 9e9ff43e16 [formerly 37a5292083] [formerly f80e16d0c9] [formerly 9e9ff43e16 [formerly 37a5292083] [formerly f80e16d0c9] [formerly bfe46bb5e6 [formerly f80e16d0c9 [formerly 31d75a4b82413b015353055668defab0095ef893]]]]
Former-commit-id: bfe46bb5e6
Former-commit-id: 307a149bea [formerly f2d07ce35c] [formerly e3670bef923e89a1f5a7985176c384fe933c5958 [formerly 8ddc4eaffd]]
Former-commit-id: e544947f2f7406e11c3bbafca5f51212bcd4decb [formerly 5d18fbe5d3]
Former-commit-id: fe5fe5b587
|
2014-04-30 14:49:24 -05:00 |
|
Steve Harris
|
eec112e4b2
|
Omaha #3085 - moved com.raytheon.uf.viz.application and com.raytheon.uf.viz.application.feature to core
Former-commit-id: 5845200789 [formerly 31f17bbb51] [formerly b7272b3248] [formerly 5845200789 [formerly 31f17bbb51] [formerly b7272b3248] [formerly 1eb121595d [formerly b7272b3248 [formerly 839a926dca01566419409138e9810f14e0e46b84]]]]
Former-commit-id: 1eb121595d
Former-commit-id: 2f14898fec [formerly a659f2bf1d] [formerly c0924bd1b1572c832d85f3f1e15e466728edca26 [formerly 88a7777e79]]
Former-commit-id: 9705b5637307e58b21d30c400b1ff41195e1224f [formerly 2eed016efd]
Former-commit-id: ae6eed5e0a
|
2014-04-30 13:59:33 -05:00 |
|
Nate Jensen
|
a11f0d304c
|
Issue #2060 fix FFG processing
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0
Former-commit-id: acfcaea04e [formerly 2d19ee46e5] [formerly 8cbea21f32] [formerly acfcaea04e [formerly 2d19ee46e5] [formerly 8cbea21f32] [formerly 9b19f95d24 [formerly 8cbea21f32 [formerly 14ce9854abc51b2791b5f93756ae12cbe69b8589]]]]
Former-commit-id: 9b19f95d24
Former-commit-id: 65ad418a94 [formerly 9a2c674142] [formerly 94b4ede51617e66b1e18ddaa60775457c6b2c3ad [formerly a33ca4e3ac]]
Former-commit-id: 3b5d2fc28c192ce41c0bfe1d25e5582a85ee8e04 [formerly 58618a1842]
Former-commit-id: eb5dd811ca
|
2014-04-30 13:08:26 -05:00 |
|
Brian.Dyke
|
f4856aae4d
|
Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)
Conflicts:
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java
edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java
Former-commit-id: 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 63137ed69c [formerly 278aab6b6f [formerly 64c3766ed570885a796f846b889d40413e8250c6]]]]
Former-commit-id: 63137ed69c
Former-commit-id: 624606c9dd [formerly fcf13ae9f7] [formerly 07e5d6948695c16b1561033e2f9374a9e992b03e [formerly 8160209e52]]
Former-commit-id: ff65ed48a968bb0c306792bbf8ffaff1d87d8edf [formerly 5d31c9ec9a]
Former-commit-id: f16c305ae4
|
2014-04-30 12:57:09 -04:00 |
|
Steve Harris
|
64492a05dc
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts (these moved to ufcore):
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapQueryFactory.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapResource.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbPointMapResource.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DefaultDbMapQuery.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/VizApp.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.ui.menus/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLShadedShapeBase.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ListSelectionDlg.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.dataplugin.maps/src/com/raytheon/uf/common/dataplugin/maps/dataaccess/util/MapsQueryUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/poesDif11u3_7uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u12uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u13uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u3_9uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDivWVIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDif11u3_9uIR.py
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDifference.py
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDivWVIR.py
edexOsgi/com.raytheon.uf.common.dataplugin/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginProperties.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.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Slice.py
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/DerivedLevelNode.java
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/OrLevelNode.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/ReferencedGeometry.java
edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/TimeAndSpace.java
edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/TimeAndSpaceMatcher.java
edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/data/AbstractRequestableData.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.common.localization/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/region/RegionLookup.java
edexOsgi/com.raytheon.uf.common.message/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.message/src/com/raytheon/uf/common/message/WsId.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/JUtilHandler.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/SizeUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/SystemUtil.java
edexOsgi/com.raytheon.uf.edex.auth/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.auth/build.properties
edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-common.xml
edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteRequestRouteWrapper.java
edexOsgi/com.raytheon.uf.edex.core/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/EDEXUtil.java
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/dataplugin/PluginRegistry.java
edexOsgi/com.raytheon.uf.edex.database/res/spring/database-common.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabaseClassAnnotationFinder.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabasePluginRegistry.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/cluster/handler/SharedLockHandler.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginFactory.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/processor/IDatabaseProcessor.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/query/DatabaseQuery.java
edexOsgi/com.raytheon.uf.edex.distribution/res/spring/distribution-spring.xml
edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/src/com/raytheon/uf/edex/esb/Main.java
edexOsgi/com.raytheon.uf.edex.esb.camel/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/StringToFile.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/jms/DedicatedThreadJmsComponent.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/spring/JmsThreadPoolTaskExecutor.java
edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-request.xml
edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/notification/PluginNotifier.java
edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring.xml
edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-ingest.xml
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: 6a80bc2971 [formerly 7f3a19cd1f] [formerly 5a3c6a11c2] [formerly 6a80bc2971 [formerly 7f3a19cd1f] [formerly 5a3c6a11c2] [formerly 3380a1dba0 [formerly 5a3c6a11c2 [formerly 505635792772e5f261f47fd980f33d371c8dbfcc]]]]
Former-commit-id: 3380a1dba0
Former-commit-id: 103318357b [formerly 6ad5b5a9d7] [formerly ba5d0a9ff7373ccedcbbb73791d2d7a098c2ff8e [formerly f168d3dddb]]
Former-commit-id: 8ccde1991c055590b9341bfb6729666eea087e32 [formerly 98b93e364e]
Former-commit-id: d214c3174d
|
2014-04-30 11:22:22 -05:00 |
|
Steve Harris
|
66ee7213aa
|
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.4.1
Conflicts (these are now in ufcore):
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/ext/colormap/ColormappedImage.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
Former-commit-id: 243988d344 [formerly 7e24fd79a1] [formerly 396daac383] [formerly 243988d344 [formerly 7e24fd79a1] [formerly 396daac383] [formerly af7fb01f53 [formerly 396daac383 [formerly a6932cbdbee31973374a6e23c08e0e39a23d99d9]]]]
Former-commit-id: af7fb01f53
Former-commit-id: bb335fd675 [formerly 9b65077ad9] [formerly aeb0a11344f6daaf21e2b40c8bb422f483add825 [formerly 225da706b7]]
Former-commit-id: 0e3911d76550ba99a7aa266f7b2ddff9d81644f3 [formerly 04f12dbaca]
Former-commit-id: 8860d8e6e7
|
2014-04-29 16:09:07 -05:00 |
|
Brian.Dyke
|
2e187af9e4
|
Merge branch 'master_14.2.1' into master_14.2.2
Merge (14.2.1-21 into 14.2.2-5)
Former-commit-id: 7364553aea [formerly c5e29cc46a] [formerly 35b637c3e2] [formerly 7364553aea [formerly c5e29cc46a] [formerly 35b637c3e2] [formerly bdda2e9a7a [formerly 35b637c3e2 [formerly 9a017e543fc6be9fd0d7b9361bd2226bf2af6211]]]]
Former-commit-id: bdda2e9a7a
Former-commit-id: fba8753c81 [formerly f8c3dca497] [formerly 864697ab3fb4d67896d81f6bc98951da3ad837df [formerly 59f34e3108]]
Former-commit-id: 756d936948a5f4a794262ababc0423b3b1e3dbfe [formerly 85bf52ef22]
Former-commit-id: 1aec51b7c4
|
2014-04-29 12:07:21 -04:00 |
|
Richard Peter
|
e748b7c1e5
|
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]]
Former-commit-id: 32957285fc
Former-commit-id: 0dfa8cc4c6 [formerly 6966b79246] [formerly 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878]]
Former-commit-id: 5715dc841fc8db519f94f6126094e2ff4eb83ea8 [formerly 24a3fe1466]
Former-commit-id: 938e39a0fc
|
2014-04-28 16:27:40 -05:00 |
|
Steve Harris
|
a0d412c9d1
|
Omaha #3085 - moved common.json and viz.datacube to core and org.codehaus.jackson to core-foss
Change-Id: I1ff27e7a023ebaad66cd4a82a2e0fea395c7d3a2
Former-commit-id: 1033e0fde7 [formerly 2be0e7730f] [formerly 7b56fb23a8] [formerly 1033e0fde7 [formerly 2be0e7730f] [formerly 7b56fb23a8] [formerly c4597ec58b [formerly 7b56fb23a8 [formerly ab93e85eb2181446576be5d58062e1c661d4ec98]]]]
Former-commit-id: c4597ec58b
Former-commit-id: 1266b9438f [formerly 9ef44d2a4c] [formerly 21bcb7ea12e3aa6614573b6302c5937f0be904d4 [formerly 7c44a9506c]]
Former-commit-id: 5539a63dbf2d0f395168e771e37c63ed6f8c5480 [formerly 983efa8dd3]
Former-commit-id: 567730e595
|
2014-04-28 16:25:21 -05:00 |
|
Lee Venable
|
b011f13fb1
|
Issue #3053 - added check for selected items.
Change-Id: Iba7dff4291679524b03518790b0e183c3a980934
Former-commit-id: 761101dd50 [formerly a8ab7f3946] [formerly 573465f316] [formerly 761101dd50 [formerly a8ab7f3946] [formerly 573465f316] [formerly e054a7ab98 [formerly 573465f316 [formerly ca47394d9578aac17d1696bd78c0fbcee5fe3f8f]]]]
Former-commit-id: e054a7ab98
Former-commit-id: 090ea0fa5a [formerly eda26e6076] [formerly d8e463c70dce54bf7b40b1d218bccb587c3b88e6 [formerly 43fdbe9ab6]]
Former-commit-id: a4e6f79e43287a75219721e1af377b8859a3b82e [formerly ede8740acc]
Former-commit-id: 3a133f6626
|
2014-04-28 15:24:26 -05:00 |
|