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 |
|
Brian Clements
|
ef0386fca8
|
Omaha #3147 removed spring from groovy RPM component spec
Former-commit-id: b6155d5482 [formerly 9d67a6c30b] [formerly 3bb680802a] [formerly b6155d5482 [formerly 9d67a6c30b] [formerly 3bb680802a] [formerly b334038a28 [formerly 3bb680802a [formerly 979ff20d55cc86319805f77ec53f32cb39555eb3]]]]
Former-commit-id: b334038a28
Former-commit-id: 08eeff08a7 [formerly 6192ab51ae] [formerly fe9d492be607366f7a5a5fb0e82f5ed775491ae6 [formerly 3a48b2036e]]
Former-commit-id: cedd5ab3d5f65e59bc8f360bc38aa723cc7373c8 [formerly f989cbe948]
Former-commit-id: 2aa0a7ad2b
|
2014-05-09 10:31:28 -05:00 |
|
Brad Gonzales
|
c9b9ec51e6
|
Omaha #3032 updated jdk to java 1.7.0_55
Change-Id: If1bcb03386aec265196cf8133a3f1e6b34eb1fc8
Former-commit-id: 286cecb8fb [formerly ad464cc0da] [formerly 91f94499aa] [formerly 286cecb8fb [formerly ad464cc0da] [formerly 91f94499aa] [formerly 35f6a5ac25 [formerly 91f94499aa [formerly 49cc6d83ac5fffc3f737699ab605948fa38117db]]]]
Former-commit-id: 35f6a5ac25
Former-commit-id: 52c91e75c3 [formerly 6bee1ed107] [formerly e7c3a113c1cfa1b639f60e13f2a8eb263f952460 [formerly f7cf5741b0]]
Former-commit-id: f2f1e349e6cc685382977526ad1c0e3f6ffcc90f [formerly 617e84afa7]
Former-commit-id: 4e4ebd83a9
|
2014-05-08 16:15:42 -05:00 |
|
Richard Peter
|
947e806283
|
Omaha #1458: Remove reference to cron.properties
Change-Id: Ia77204b32b9bfcc56ae795d47cdce4ceea307b29
Former-commit-id: c4b6c6cc6e [formerly 63114b4f82] [formerly 86aea04167] [formerly c4b6c6cc6e [formerly 63114b4f82] [formerly 86aea04167] [formerly 0430619d7b [formerly 86aea04167 [formerly f95bb3a43e5a445c0a43628a9ed5e11e23a6a9b2]]]]
Former-commit-id: 0430619d7b
Former-commit-id: c7ed1a1a93 [formerly 328a48a33d] [formerly 1d72a41cca6b73062aea9ce9df36d0a583f99940 [formerly 02c77af062]]
Former-commit-id: e6a8171a0a16b8b60e17b8f3deef62cac56bd1ec [formerly 400aa47f46]
Former-commit-id: a74bd68f72
|
2014-05-08 12:58:49 -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 |
|
Nate Jensen
|
e2da886152
|
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 733740f64f [formerly 8365e5aa56] [formerly 51608c090e] [formerly 4851989a7a [formerly 51608c090e [formerly 3d76d2510d7a0b96f3d8800e2c46727d08ad1fa6]]]]
Former-commit-id: 4851989a7a
Former-commit-id: 69e5254ffc [formerly 6a71446d52] [formerly 696b95dfa5cc5aea77b8658c36e4e32bb84db5f9 [formerly 80d97584d3]]
Former-commit-id: fa520ffe521607967ec46fabe438c0582171a75e [formerly af81eecb2d]
Former-commit-id: be64d69f3c
|
2014-05-08 09:36:04 -05:00 |
|
Richard Peter
|
f616052d9a
|
Omaha #1458: Break-out cron.properties.
Change-Id: I8d0cdafe812c42158ce38cdb3903737693b6f528
Former-commit-id: ab64a3e814 [formerly ad3f6c4af3] [formerly 6469ae94ed] [formerly ab64a3e814 [formerly ad3f6c4af3] [formerly 6469ae94ed] [formerly 348bc25760 [formerly 6469ae94ed [formerly 5954c321f38ba64d305c15270b12289fb34ccdff]]]]
Former-commit-id: 348bc25760
Former-commit-id: 899b8ce879 [formerly c9d8bfdd06] [formerly a327ca6aece2679db79622f22c10369b6cebc586 [formerly 95488f49b1]]
Former-commit-id: 42e521199bcad7a7bb553d4e0ab315e50be9c393 [formerly 284e1b762d]
Former-commit-id: 8c41358d2c
|
2014-05-08 09:18:49 -05:00 |
|
Richard Peter
|
0f0eb6d584
|
Omaha #2782: Update thread based logging
Change-Id: Ifec2b15741c0fb4fa97e3c17659ddb80b69c47a8
Former-commit-id: 731f55d574 [formerly 242716fb0f] [formerly d5ec01f7c0] [formerly 731f55d574 [formerly 242716fb0f] [formerly d5ec01f7c0] [formerly adff7b5684 [formerly d5ec01f7c0 [formerly fe464020d287bbf21b7bc04402d31c97114c195b]]]]
Former-commit-id: adff7b5684
Former-commit-id: e3e1298591 [formerly 741710881f] [formerly a8128262c0240c076be7f2d7613f15608d925c72 [formerly 7a7b65860b]]
Former-commit-id: 065948ec980c395d5dc6d7a3764fa1461ccb4d8e [formerly 401a880686]
Former-commit-id: 28d5614351
|
2014-05-08 09:06:31 -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 |
|
Everett Kladstrup
|
cc773e68b3
|
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 4ea3156453 [formerly 516a50a6a1] [formerly 3a00185e3c] [formerly b4a76a575a [formerly 3a00185e3c [formerly ce1379d30d26f96959dc07d8a7f3a1fc3d355c99]]]]
Former-commit-id: b4a76a575a
Former-commit-id: a472cd5363 [formerly a1070cc1ac] [formerly 0b36cc357c9ac92e1860eb4bdfa5b01916468b94 [formerly ce743b3c43]]
Former-commit-id: 0e2083fe7450a35200ddd48f67051f8764b4cc01 [formerly 279be89f4b]
Former-commit-id: dffec9a07f
|
2014-05-07 12:54:37 -05:00 |
|
Ben Steffensmeier
|
0e15da7d1b
|
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 5a52d61636 [formerly 462ec63608] [formerly 18ec643a30] [formerly 973c6fdb55 [formerly 18ec643a30 [formerly 3bd0a076add20c38fad41461295fb430e8ceb5cb]]]]
Former-commit-id: 973c6fdb55
Former-commit-id: efd43c399e [formerly 3e9e6abde2] [formerly 458e8bf278ed316f4bc7434b69cdf0bf5245ba6c [formerly 0bd28752bc]]
Former-commit-id: a45623b2202b018c7b2e5d56a8d61b06105a071a [formerly ed9993067e]
Former-commit-id: d02dfbb11f
|
2014-05-06 18:06:44 -05:00 |
|
Nate Jensen
|
fe086727bb
|
Merge "Issue #3101 fix some derived parameters on win64 platform" into omaha_14.3.1
Former-commit-id: 7193103faf [formerly be75956418] [formerly ddb3610e24] [formerly 7193103faf [formerly be75956418] [formerly ddb3610e24] [formerly 69b6c9426f [formerly ddb3610e24 [formerly 31d9df701d689ceaf76c9d241d36df5c9c463bb3]]]]
Former-commit-id: 69b6c9426f
Former-commit-id: 02be49d972 [formerly f2e1ee0aeb] [formerly d847d191e396a392b956f225e997154b5bd29006 [formerly 7360ee5c1a]]
Former-commit-id: 2eb9777b7d68cf5456e94bea7e9cd0225efae5d9 [formerly 7d8a767030]
Former-commit-id: d1493a3a82
|
2014-05-06 17:29:45 -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 |
|
Nate Jensen
|
9831077b42
|
Issue #3101 fix some derived parameters on win64 platform
Change-Id: I9de1d31e7f7c19af437aef834aa84f163bf36d86
Former-commit-id: 3aa9bfdca1 [formerly 49d34cc4e4] [formerly 5191b61b30] [formerly 3aa9bfdca1 [formerly 49d34cc4e4] [formerly 5191b61b30] [formerly aa7c1fac90 [formerly 5191b61b30 [formerly 4659c0240aa31b615bc50228906d514f47a72f94]]]]
Former-commit-id: aa7c1fac90
Former-commit-id: c333277d30 [formerly 815aa21d8e] [formerly e218d9c6b2e2544a412d7bf24b528ba73c8cd8fc [formerly 8c1748d370]]
Former-commit-id: a4bf8704f87869be96548083ce3e4e75a769e292 [formerly b708774e64]
Former-commit-id: cf09a6729c
|
2014-05-06 17:08:04 -05:00 |
|
Everett Kladstrup
|
88ea345459
|
Omaha #3112 Fix adding classes to WFS jaxb
* Rebuild JAXBContext after adding additional classes
* Set output directory in build.properties to fix deploy location
* Remove unecessary dependencies from wfs manifest
Former-commit-id: 129f3017bb [formerly 2ee2db6f38] [formerly 1184e77f1a] [formerly 129f3017bb [formerly 2ee2db6f38] [formerly 1184e77f1a] [formerly aedb166b4d [formerly 1184e77f1a [formerly bd479bc83287f3c1bb9dd65176b9ea3f5b8901d1]]]]
Former-commit-id: aedb166b4d
Former-commit-id: de20eacce2 [formerly 5f378b30f0] [formerly 2e1fc87ea552bfc388ab6869d1d09dea57299cff [formerly 08e8a4a60a]]
Former-commit-id: 9120483421ae11f403d09788c224edb0bce9fd34 [formerly 8a4e0f8d71]
Former-commit-id: 99fd65216e
|
2014-05-06 17:07:23 -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 |
|
Richard Peter
|
c85f22eb55
|
Issue #2726: update smartInit threads to 1
Change-Id: Ic2d432087f66fd9f03b3d6f01fefce8af0d5b0b0
Former-commit-id: 2044b64206 [formerly 884562700a] [formerly 03ab7599de] [formerly 2044b64206 [formerly 884562700a] [formerly 03ab7599de] [formerly 611c010968 [formerly 03ab7599de [formerly c12469d133558750e85049f7ce0f0a42b802c2b9]]]]
Former-commit-id: 611c010968
Former-commit-id: 8e8e1c45ed [formerly be288505e0] [formerly f30788353ad2101cd2e64a4eed43d47dc68ddbb5 [formerly 4f2d470801]]
Former-commit-id: 91832432fed4e1ab82df2940b746247f362e5e2d [formerly a03997122b]
Former-commit-id: fc1f958e5b
|
2014-05-06 15:54:23 -05:00 |
|
Nate Jensen
|
12e89bf78d
|
Issue #2060 genericize DataURIFieldConverter
Change-Id: I885b0a8ec64eb69256c04fa2476814b1300fcdd4
Former-commit-id: 37b72c933b [formerly 7701820902] [formerly ff6c77420c] [formerly 37b72c933b [formerly 7701820902] [formerly ff6c77420c] [formerly 87b6df4840 [formerly ff6c77420c [formerly 0a7265da59457e8dc6a122db81b134d6555d5276]]]]
Former-commit-id: 87b6df4840
Former-commit-id: b16bfd2b38 [formerly d1a040b9c2] [formerly 620466e14629a8e102bf9c9fd5dc3bbc2e70ff37 [formerly a6363fc3d4]]
Former-commit-id: 176e5be59eab5566cf29af7c6865a3042d0ab473 [formerly 5f08921768]
Former-commit-id: 17ddc5d8e5
|
2014-05-06 13:10:48 -05:00 |
|
Nate Jensen
|
77045e05ce
|
Merge "Issue #2060 fill in units on GridRecords created from URIs" into omaha_14.3.1
Former-commit-id: 8b2c2d4be5 [formerly d83fad0054] [formerly 0e3876de34] [formerly 8b2c2d4be5 [formerly d83fad0054] [formerly 0e3876de34] [formerly 4f734ae7f9 [formerly 0e3876de34 [formerly c68f2924c4c7f998af859d7c88cd9d0049d636e5]]]]
Former-commit-id: 4f734ae7f9
Former-commit-id: de7bade647 [formerly 732aaa6001] [formerly ad966bafd4b27ea29634f0d48df0a0cd01558773 [formerly 044d086fc1]]
Former-commit-id: 6911bb772bb5191fbb00c039757c3640c87a1879 [formerly 4db3b99181]
Former-commit-id: c8cc3b1b8e
|
2014-05-06 13:09:12 -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
|
056a6bd882
|
Omaha #3116 changed log formatter class to match camel 2.12.3
Former-commit-id: 73b643e157 [formerly 170ce2c157] [formerly c77ba25dc8] [formerly 73b643e157 [formerly 170ce2c157] [formerly c77ba25dc8] [formerly 51eb6c9f06 [formerly c77ba25dc8 [formerly a63f569de8d9e8c924de9a9d9ca101e3e04e567d]]]]
Former-commit-id: 51eb6c9f06
Former-commit-id: 474068d56a [formerly 5b26766041] [formerly a092d2d161356b1089eedda592170e6720447ad2 [formerly b8a648f543]]
Former-commit-id: af82e9e17e53e02626347f7e4818c1149ca3ffd9 [formerly ffc02d68d6]
Former-commit-id: 3c9f5ff37b
|
2014-05-06 11:38:38 -05:00 |
|
Richard Peter
|
a21d7ff038
|
Issue #2726: Autoset route startup order.
Change-Id: I1f4165b6eab12207cf6b6d31964e8170ebe1bddc
Former-commit-id: f76ed476c8 [formerly 8ae9cfba55] [formerly b148d11ec9] [formerly f76ed476c8 [formerly 8ae9cfba55] [formerly b148d11ec9] [formerly 4dc91f494f [formerly b148d11ec9 [formerly 9b9d2b475f4777febf125e4013cba0d971eaf8e8]]]]
Former-commit-id: 4dc91f494f
Former-commit-id: 9846fbd82c [formerly 7fe7b43ee2] [formerly c051c2b6a07908c54dd3268091a67a3084664d5b [formerly c6719da76b]]
Former-commit-id: 87bf6e58065855e010b5eeaf478f1099b3c04845 [formerly 4a140afac6]
Former-commit-id: 4f6a9a0562
|
2014-05-06 09:46:41 -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 |
|
Nate Jensen
|
0fc04a8c55
|
Issue #2060 fix sat precip for grid data URI removal
Change-Id: Iaa5144a63ff455f5c12a060a9daad0dd0bd04e58
Former-commit-id: f76ace3c9b [formerly 2b6c30e67d] [formerly 0cf0f724f4] [formerly f76ace3c9b [formerly 2b6c30e67d] [formerly 0cf0f724f4] [formerly d82f6e5ff6 [formerly 0cf0f724f4 [formerly cf0bb31583f0ec0b2135aa9101f3247e88e877d0]]]]
Former-commit-id: d82f6e5ff6
Former-commit-id: 3853ef16bb [formerly 09091ccf25] [formerly 7beb650628fb602c30c71cbf5eab29724e2cc3f8 [formerly 97597c3ab1]]
Former-commit-id: 34e886c76b22b953edb7a826d23a880a02b62b77 [formerly 0840a62eb8]
Former-commit-id: d50f19d715
|
2014-05-05 13:06:08 -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 |
|
Brad Gonzales
|
efd2324660
|
Omaha #3106 Updated deploy and install ant scripts to handle the 14.4.1 repository structure.
Change-Id: I7de7600fbcc6bb6ebc9392aef291babc086f3115
Former-commit-id: 0470903200 [formerly cbcd7dcc3e] [formerly df353f06f5] [formerly 0470903200 [formerly cbcd7dcc3e] [formerly df353f06f5] [formerly 39a2ec8f46 [formerly df353f06f5 [formerly 9372afbd268a61e63b2c9ba2b25529e654cfee6e]]]]
Former-commit-id: 39a2ec8f46
Former-commit-id: 58fda9c22a [formerly b33bd153f4] [formerly 702f18abf50a79b37863af04c5f8463202ed6024 [formerly 78714c6ff7]]
Former-commit-id: ca2a543bc5fbdcba51437125a0e66e29af1de373 [formerly 91caaba15c]
Former-commit-id: 8aca12b211
|
2014-05-02 13:09:57 -05:00 |
|
Richard Peter
|
ce48a0230e
|
Merge "Issue #2940 Better error message for bad XMRG config in FFMP" into omaha_14.3.1
Former-commit-id: 98fa705dd0 [formerly f38816d168] [formerly dc0b598fd4] [formerly 98fa705dd0 [formerly f38816d168] [formerly dc0b598fd4] [formerly 132d63ac44 [formerly dc0b598fd4 [formerly 28b33188773001c34946464093319dc2a1117be9]]]]
Former-commit-id: 132d63ac44
Former-commit-id: 2507aaf753 [formerly 8e141a137a] [formerly c5d890d7b24b88a20dc8c01d92647c6864edfb22 [formerly 5314b412b4]]
Former-commit-id: ad8d5ade754f2f63500d72978fe455c4ad54fb06 [formerly b9351199b8]
Former-commit-id: 9326b9d125
|
2014-05-02 10:05:59 -05:00 |
|
Richard Peter
|
aa4e137fe6
|
Merge "Issue #3095 Update JGridData for creation of numeric java package." into omaha_14.3.1
Former-commit-id: 39467f210d [formerly 6bb353a05d] [formerly 51ba60d62b] [formerly 39467f210d [formerly 6bb353a05d] [formerly 51ba60d62b] [formerly 24f1c7b385 [formerly 51ba60d62b [formerly cab873d5b9437b8abd22adb65c42b886710e50a9]]]]
Former-commit-id: 24f1c7b385
Former-commit-id: 0dda5a7c40 [formerly 592e9171e1] [formerly f5cd6aa1d45daa261c05965acd4769b63f5b3227 [formerly 1f7e076018]]
Former-commit-id: e5558a5d7b030baee414180a9b43047e86f30a39 [formerly 28c8c6357a]
Former-commit-id: f34020dcc0
|
2014-05-02 10:05:29 -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 |
|
Ben Steffensmeier
|
c2e3e72d01
|
Issue #3095 Update JGridData for creation of numeric java package.
Former-commit-id: 80104eaf42 [formerly 956f62a6ec] [formerly 6bdaba048c] [formerly 80104eaf42 [formerly 956f62a6ec] [formerly 6bdaba048c] [formerly 23d6da4a18 [formerly 6bdaba048c [formerly a3081bf46908788e78c707bf51e08f6c98d997bc]]]]
Former-commit-id: 23d6da4a18
Former-commit-id: ae0185a740 [formerly d2c0499f2c] [formerly e59b9a37c055ead6793b199f1f61c40b65e25ce2 [formerly 3300d8c75c]]
Former-commit-id: b8a7373be1db5d578132241657b4da4ea3baedd5 [formerly c2a3dbe9af]
Former-commit-id: dd315aa9b8
|
2014-05-01 18:02:08 -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 |
|
Steve Harris
|
9e1da44e3b
|
Omaha #3085 - re-deleted stuff that was re-added in the merge from omaha_14.3.1 to omaha_14.4.1
Change-Id: Id13953881429545bccb590a550c23a73f77d585e
Former-commit-id: 05d6049e35 [formerly 11ca44c583] [formerly 70ee74a311] [formerly 05d6049e35 [formerly 11ca44c583] [formerly 70ee74a311] [formerly ab0b1ec047 [formerly 70ee74a311 [formerly 75d4816f97b0b6fa2bf93847038c4f15b3479e39]]]]
Former-commit-id: ab0b1ec047
Former-commit-id: e72b097763 [formerly beba75f87c] [formerly c4fa57c01ab1fe1ea3b7f0c5c4f08b8a4e6ba322 [formerly 579eb6e47a]]
Former-commit-id: f0b40a94c6bd9da6fed694725a0b76873bd047a5 [formerly 64849d50ec]
Former-commit-id: 56bf68d145
|
2014-05-01 12:53:06 -05:00 |
|
Nate Jensen
|
b2b5727db3
|
Merge "Issue #3099 - handle empty location name lists in the data request" into omaha_14.3.1
Former-commit-id: dba33e281e [formerly ba9ed2aba3] [formerly b7536a398b] [formerly dba33e281e [formerly ba9ed2aba3] [formerly b7536a398b] [formerly 96071c250d [formerly b7536a398b [formerly 1ccbd542f3a5025ba0e0c8d640170972823a583d]]]]
Former-commit-id: 96071c250d
Former-commit-id: c617423fd7 [formerly dbca36c2bc] [formerly 88095fd377297b348e1d0c64c9215b50da8eef27 [formerly 4c2923246a]]
Former-commit-id: f4c5590d3e741902d497b7b5cb7b21c8ccf1049b [formerly 704eff96aa]
Former-commit-id: 7c748842f0
|
2014-05-01 12:40:41 -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 |
|
Bryan Kowal
|
3ec47319cc
|
Issue #3099 - handle empty location name lists in the data request
Former-commit-id: dfd5e3dbad [formerly ff21ef813c] [formerly 5eac78f0e0] [formerly dfd5e3dbad [formerly ff21ef813c] [formerly 5eac78f0e0] [formerly a9b9a8b8c4 [formerly 5eac78f0e0 [formerly 79603ec579d6ebcd1ef707f637e1b207ae18f803]]]]
Former-commit-id: a9b9a8b8c4
Former-commit-id: 5267bae3dd [formerly 4775dc1f40] [formerly 766f5d140cfb513aced9899ffa7b673d5595123d [formerly 2079aec2bb]]
Former-commit-id: e262c8f5f445fb2cdc7edc1447e80f9bd8e97f6e [formerly bf24af6980]
Former-commit-id: 10a57d5299
|
2014-05-01 12:12:42 -05:00 |
|
Nate Jensen
|
425fdb1674
|
Merge "Issue #2854: Reorganize deltaScripts" into omaha_14.3.1
Former-commit-id: b911f3e9b5 [formerly 1d157a16e3] [formerly 7fbdb9ff83] [formerly b911f3e9b5 [formerly 1d157a16e3] [formerly 7fbdb9ff83] [formerly bcb82bedc6 [formerly 7fbdb9ff83 [formerly a57a632a37cbee857a5f9fb8eb1f1cfa6a59a0b2]]]]
Former-commit-id: bcb82bedc6
Former-commit-id: 8ae67e0d7f [formerly 037fe502d7] [formerly 793328ce1c59c6fb48e922f66fcf2785e57bd487 [formerly e5eb1ab87e]]
Former-commit-id: acc622a694e300635d3d9dee8f541f47970622d0 [formerly 1b78d60b52]
Former-commit-id: 8961b7305e
|
2014-05-01 12:06:13 -05:00 |
|
Nate Jensen
|
f4102f6eaf
|
Merge "Issue #3101 safe cast numpy shape values to Number" into omaha_14.3.1
Former-commit-id: 97ea9dd708 [formerly 03b412c136] [formerly b28e5291d6] [formerly 97ea9dd708 [formerly 03b412c136] [formerly b28e5291d6] [formerly 244183db25 [formerly b28e5291d6 [formerly c1dae5ae673d9db6d4c1b887b68b5cbaa815c6fa]]]]
Former-commit-id: 244183db25
Former-commit-id: c7610d0a3a [formerly 59623a97d0] [formerly d915e1041f3582440bb6f108021a9ffb531db781 [formerly 02059a512f]]
Former-commit-id: c6458474c0ccf717cf9ee4e52315c02b81f3edd3 [formerly 800ee1a68c]
Former-commit-id: 1f294864f0
|
2014-05-01 11:21:54 -05:00 |
|
Nate Jensen
|
7f6e325724
|
Issue #3101 safe cast numpy shape values to Number
Change-Id: Ie81917cf19819e159195a50d6ad786d20c32136c
Former-commit-id: fc261ab303 [formerly 7b2ed421f0] [formerly 2a0775e748] [formerly fc261ab303 [formerly 7b2ed421f0] [formerly 2a0775e748] [formerly 76ad31501b [formerly 2a0775e748 [formerly 8df8db0d9b9cc0848bf73a09bcedb8cb7947a4bb]]]]
Former-commit-id: 76ad31501b
Former-commit-id: 3634889dab [formerly ffb294cab4] [formerly cf11210c48f3e873f15155bc8644fb9af1296446 [formerly 191f6c3385]]
Former-commit-id: a264003449737f399c4846d23735afced10fd273 [formerly ee285cfc57]
Former-commit-id: 4669a93a96
|
2014-05-01 11:01:37 -05:00 |
|
Dave Hladky
|
800641027c
|
Issue #2992 Missed perl script
Former-commit-id: f844c98853 [formerly 9a43ac36e6] [formerly 23433f628d] [formerly f844c98853 [formerly 9a43ac36e6] [formerly 23433f628d] [formerly 904a608495 [formerly 23433f628d [formerly b2c19dd8cfa3eee138f2b9abf7289d464d94ef46]]]]
Former-commit-id: 904a608495
Former-commit-id: 76c963b690 [formerly bc4067c5d8] [formerly d66d8ebcef31eae8a5b0eefbe03af2d980e7f476 [formerly dbe4f68100]]
Former-commit-id: 11e66bf207067369386858e6d5a550d4aa1e7161 [formerly 741e809c95]
Former-commit-id: a520e57f73
|
2014-05-01 08:48:38 -05:00 |
|
Greg Armendariz
|
10a36c1f9d
|
Merge "Issue #3089 fixed init.d script for collaboration dataserver RPM" into omaha_14.3.1
Former-commit-id: fece69eb09 [formerly 2994753636] [formerly 1e48076fb2] [formerly fece69eb09 [formerly 2994753636] [formerly 1e48076fb2] [formerly 58eaf444bd [formerly 1e48076fb2 [formerly b4c0a78c01c9048ccac6fcd098d274380159fd0c]]]]
Former-commit-id: 58eaf444bd
Former-commit-id: 72793f2c24 [formerly 9f6eff005b] [formerly ac1328cf7911a36196114732a8d00e8c762670a8 [formerly e1d91769fe]]
Former-commit-id: 3e7b3d58ae5b3be3e7237d313288d9787261f317 [formerly 733b64a851]
Former-commit-id: 4066e1c518
|
2014-04-30 19:34:43 -05:00 |
|