Richard Peter
|
aef98d5342
|
Merge "Issue #2473 Remove deprecated grib functionality Change-Id: I14f7df9fc9eb09a7569193efbf17c75d6af6ca23" into development
Former-commit-id: 7068ab9e88 [formerly 8f54e49398] [formerly 48b3816b84] [formerly 2d0bb0b56b [formerly 48b3816b84 [formerly 6ce82e330ef6caa5defd9252458a4b81b087d64d]]]
Former-commit-id: 2d0bb0b56b
Former-commit-id: 5c8366a821b77ac3e8b3d1bba8cee7c7d0b876ca [formerly ef49a322f2]
Former-commit-id: 60e49cf211
|
2013-10-15 10:49:13 -05:00 |
|
Ben Steffensmeier
|
253ada50d5
|
Issue #2473 Remove deprecated grib functionality
Change-Id: I14f7df9fc9eb09a7569193efbf17c75d6af6ca23
Former-commit-id: d5eaefeeed [formerly c22ccb6c4c] [formerly cfc8bb859f] [formerly 94560e37c8 [formerly cfc8bb859f [formerly 9d903e94114cacee2a6abec6f83880fa8b978180]]]
Former-commit-id: 94560e37c8
Former-commit-id: f70cf023d739b92df09c9ab8e0c52a3bc0acf093 [formerly 2e0698aa06]
Former-commit-id: c960405800
|
2013-10-15 10:48:29 -05:00 |
|
Nate Jensen
|
e624f85829
|
Issue #2361 remove XML annotations and IDecoderGettable from a variety of plugins
Change-Id: Ib9b09659bbcca9b47c3e185e895d0deb1ba23739
Former-commit-id: 6437ca3524 [formerly 145b6fffce] [formerly 6c2ff04b69] [formerly f82364f18e [formerly 6c2ff04b69 [formerly 065be6691bf102699dc7ece3424f6972792c4d6f]]]
Former-commit-id: f82364f18e
Former-commit-id: 2f822db8e09769a244d22e12165589f6a7d39728 [formerly ffe1c83166]
Former-commit-id: 522393bf45
|
2013-10-15 10:08:15 -05:00 |
|
Nate Jensen
|
a7f9b3ecb5
|
Issue #2361 fix SCAN Alarm errors
Change-Id: I6c47a38dd3b5c107188fbaabec859448b516bb8b
Former-commit-id: b5d99172fd [formerly 89bf42161b] [formerly 0f8ecc7c48] [formerly 9069dc9a0c [formerly 0f8ecc7c48 [formerly cac9beb945a4edccc5c4304e8d6d02e5ed0fd144]]]
Former-commit-id: 9069dc9a0c
Former-commit-id: 02691b73fce3638db53fe45b61d6f6fc33ad6f95 [formerly f8c23ec052]
Former-commit-id: 3c8f7101d5
|
2013-10-15 08:53:12 -05:00 |
|
Bryan Kowal
|
07b0c95cb8
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 49dd7daf05 [formerly 3f4263fa07] [formerly a929dec887] [formerly c13018301e [formerly a929dec887 [formerly b3e74019d1a8550c1c7cbebe219dee3ba7e603b3]]]
Former-commit-id: c13018301e
Former-commit-id: 01f5de1dacc767ea28030a4861c52d252dbd57ba [formerly 0a06af1fdd]
Former-commit-id: f731c424bb
|
2013-10-14 17:58:22 -05:00 |
|
Nate Jensen
|
4a555210cc
|
Issue #2361 fix build
Change-Id: I7c93d2be6a04d3414db14e97d0a6a9b2d928ffbd
Former-commit-id: d103e67426 [formerly 2ae2b7faab] [formerly 1e3af0bd1f] [formerly 0adc85a58a [formerly 1e3af0bd1f [formerly d90dae07bd4507c96bb60a4ed372f206aeac74a7]]]
Former-commit-id: 0adc85a58a
Former-commit-id: bdae1a43acecf14bccd2238a2af4062982798c09 [formerly aecb906e82]
Former-commit-id: 45c65ddffd
|
2013-10-14 16:37:52 -05:00 |
|
Richard Peter
|
37491ee4e2
|
Merge "Issue #2468 compare DataTime without Calendar. Change-Id: I94f5258d04a53ba77c0e0d7af8637d96dd1ecb59" into development
Former-commit-id: 20ae99b316 [formerly fe606f370e] [formerly 9fa7f87769] [formerly 952f7be167 [formerly 9fa7f87769 [formerly c45932f98cfeb3b4054b8c632e477c6b344590b7]]]
Former-commit-id: 952f7be167
Former-commit-id: 6c02ad235e39a481d264786eff028e259a749bb8 [formerly e656cf1a4c]
Former-commit-id: a0d6c8dd00
|
2013-10-14 15:43:59 -05:00 |
|
Ben Steffensmeier
|
cc521e9742
|
Issue #2468 compare DataTime without Calendar.
Change-Id: I94f5258d04a53ba77c0e0d7af8637d96dd1ecb59
Former-commit-id: fa304d28a6 [formerly 7901fd821e] [formerly 27758e3e7f] [formerly 88d9dd4a9d [formerly 27758e3e7f [formerly c988286b20545bbe7e7dab3d717ebd7f78968048]]]
Former-commit-id: 88d9dd4a9d
Former-commit-id: 562cd76a49db8306a459ab71be58664e0374fd7b [formerly 18b8371f4c]
Former-commit-id: 1e6fe1a4ef
|
2013-10-14 15:37:25 -05:00 |
|
Nate Jensen
|
9d1df167be
|
Issue #2361 replace hibernatables being detected by SerializableManager with detection from open source reflections
Change-Id: I33ddc5eb2acb909d79f6d1121747dc2aa7489c2e
Former-commit-id: 2fb28dce46 [formerly d7e4576380] [formerly b49a2ceb2f] [formerly 40847d0edf [formerly b49a2ceb2f [formerly 16205ab7302195e99c8af69f9d24b41bca869ce3]]]
Former-commit-id: 40847d0edf
Former-commit-id: 354b93b5a9315917fe3ed51f812147bc484eb332 [formerly 9e4100b0e1]
Former-commit-id: d84f47b609
|
2013-10-14 15:30:09 -05:00 |
|
Ben Steffensmeier
|
cd2ad3dd0b
|
Issue #2402 Drop grib split to one thread, remove LargeGribFile from ISerializeableObject file.
Former-commit-id: dcf275dbc3 [formerly 75cef40e49] [formerly cb37bc8e38] [formerly afe18f40e6 [formerly cb37bc8e38 [formerly 0b0476bf4df65366fb4bfe8cbead30dde1620054]]]
Former-commit-id: afe18f40e6
Former-commit-id: c06cadf8da2180a759be6d6815884e1dec901ed4 [formerly 66d74b3884]
Former-commit-id: 1f68a68d02
|
2013-10-14 11:46:57 -05:00 |
|
Nate Jensen
|
8442503010
|
Merge "Issue #2333 Removed more unused fields from satellite record" into development
Former-commit-id: 72cea9a79b [formerly d60c08024f] [formerly 01b534fc5a] [formerly b9cf1a6533 [formerly 01b534fc5a [formerly 49ba8c831ec6318b82d66372c8370b97070733dd]]]
Former-commit-id: b9cf1a6533
Former-commit-id: 6b0133f62a6a2ded3efd1d24e3d4f04b8fb13933 [formerly 480acfddfb]
Former-commit-id: 89a7c7a4fe
|
2013-10-14 11:41:45 -05:00 |
|
Richard Peter
|
e13d9f0fed
|
Merge "Issue #2402 Remove excessive grid point count output." into development
Former-commit-id: 2dec51d9b8 [formerly fa3d3ad219] [formerly 8466d69993] [formerly ac61eedd88 [formerly 8466d69993 [formerly ef68e9c3459e1e1cf40b433e05e0c6beea5f18e0]]]
Former-commit-id: ac61eedd88
Former-commit-id: 6c2bcc48209bc3015608c9d5046e2c3b60853106 [formerly 3af222d8da]
Former-commit-id: fdef1c8039
|
2013-10-14 11:16:03 -05:00 |
|
Richard Peter
|
6a0020cf1c
|
Merge "Issue #2386 - Implement the front end for multiple data type overlap rules Peer review comments" into development
Former-commit-id: e1ba2afa4c [formerly 1f772816de] [formerly d8b49516dc] [formerly c056c93104 [formerly d8b49516dc [formerly 581cc8e7319216c910e71936820f7414d2281fed]]]
Former-commit-id: c056c93104
Former-commit-id: 5a35bd165eea54bab27de852d18ba49301eed727 [formerly eb1ed4cda6]
Former-commit-id: b6d6458ab2
|
2013-10-14 11:15:40 -05:00 |
|
Ben Steffensmeier
|
096ff46a78
|
Issue #2402 Remove excessive grid point count output.
Former-commit-id: 70416f3d59 [formerly 944aee22c9] [formerly a42c0654f5] [formerly f290019e64 [formerly a42c0654f5 [formerly 4c25d75411a8c28cc2a2511c8d3a4876eaaa7be4]]]
Former-commit-id: f290019e64
Former-commit-id: ecc7464ebaf80387216a12b10848191a76c2b320 [formerly 18e33cba9d]
Former-commit-id: bc215e7276
|
2013-10-14 11:13:03 -05:00 |
|
Steve Harris
|
cc5e19f181
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
Former-commit-id: d455ad79ce [formerly 1581adfa64] [formerly 852c02c848] [formerly 545d7ca463 [formerly 852c02c848 [formerly 15ce9171f199bb062ed1374d00ae842b77c1dc62]]]
Former-commit-id: 545d7ca463
Former-commit-id: 519ff37a80328281e8c99f985371e3ec85b3bee0 [formerly 5cf3cc1efc]
Former-commit-id: 2f0968a279
|
2013-10-14 09:28:24 -05:00 |
|
Steve Harris
|
99dac05b85
|
13.5.2-10 baseline
Former-commit-id: 2f59153a18 [formerly 1efbba7a4b] [formerly 46c351de6c] [formerly c3d29c0fa0 [formerly 46c351de6c [formerly 83863a9833f309203af0ee34d503bf280e596397]]]
Former-commit-id: c3d29c0fa0
Former-commit-id: 908adf82a3e2b56f5c1b086392c40f7024701459 [formerly 5f86804c81]
Former-commit-id: d1f38eb936
|
2013-10-14 09:59:31 -04:00 |
|
Mike Duff
|
27fd5ba0fa
|
Issue #2386 - Implement the front end for multiple data type overlap rules
Peer review comments
Change-Id: I1f0186b3e08f3013a6dc4dc3dbf7c2e0a19404bf
Former-commit-id: 10f3fa86b0 [formerly c4e501aaf9] [formerly a220ff05b0] [formerly a69120c623 [formerly a220ff05b0 [formerly 69a5242579fdeacceba5ed2ce73be01e671328ae]]]
Former-commit-id: a69120c623
Former-commit-id: 5c24818dd9e96881368fc526e9d32dce344061c7 [formerly f9074dc896]
Former-commit-id: 610c937a00
|
2013-10-11 18:18:18 -05:00 |
|
Max Schenkelberg
|
f28272fa6e
|
Issue #2333 Removed more unused fields from satellite record
Change-Id: I02ec3ff328606673d717c31e583c2679389e87ec
Former-commit-id: f34750cb5f [formerly 3c2492cdbe] [formerly b68b8de21b] [formerly 8fddd5a57b [formerly b68b8de21b [formerly 91c5da670e6b23814532b473c93237744398369d]]]
Former-commit-id: 8fddd5a57b
Former-commit-id: f41b2ac789434c1654f92e97b783cd78ec044300 [formerly 3b53d18be4]
Former-commit-id: 9bd27e3c43
|
2013-10-11 16:17:52 -05:00 |
|
Richard Peter
|
d3598aaffb
|
Merge "Issue #2402 Make grib large grid handling more dynamic. Change-Id: I463f57ac5ccbef2773ee299f36fa808c62d7da2d" into development
Former-commit-id: 0a802a9218 [formerly ea74adff8f] [formerly a99e286c0f] [formerly dba525c5e6 [formerly a99e286c0f [formerly f0ab566352660170b71b46f6517e371d42f973df]]]
Former-commit-id: dba525c5e6
Former-commit-id: eba7342fd247b0069dd81a78c0141f3af11af599 [formerly 2d1963c665]
Former-commit-id: 6dbdecfb9a
|
2013-10-11 15:34:31 -05:00 |
|
Ben Steffensmeier
|
46e676c816
|
Issue #2402 Make grib large grid handling more dynamic.
Change-Id: I463f57ac5ccbef2773ee299f36fa808c62d7da2d
Former-commit-id: 38ac706b80 [formerly 2de4562585] [formerly 3fd473e25d] [formerly 0ecab8d44e [formerly 3fd473e25d [formerly bec1391240d3bf2ac0da4e8b29ae6ce3985e3d32]]]
Former-commit-id: 0ecab8d44e
Former-commit-id: bd8e77a0c857b6855c5e1bd662bfd797af1e0932 [formerly 78b278e4ef]
Former-commit-id: 0a125ce17b
|
2013-10-11 15:22:32 -05:00 |
|
Max Schenkelberg
|
f8795885f5
|
Issue #2081 Fixed null pointer in DataURIUtil
Change-Id: Ic052c0d12e51949568bb5540ab97b1e0091ca231
Former-commit-id: 5cecf2a1d6 [formerly 8e1a0cb397] [formerly 6f0d8eb4c56b8a599bcfb21b7b4597008c636cb0 [formerly 819df41147]] [formerly 67bfa28850 [formerly 819df41147 [formerly ab9174cac744785588c49237fde5cb497fb09d0f]]]
Former-commit-id: 67bfa28850
Former-commit-id: f3c95fbb85e13f19cb86ae341c6d8e60d4b3c216 [formerly 50fd97a5d5]
Former-commit-id: fe93c69429
|
2013-10-11 14:29:11 -05:00 |
|
Nate Jensen
|
d3e361eaa4
|
Merge "Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104." into development
Former-commit-id: 568e5bd9f6 [formerly c6c2f50562] [formerly 8208d756c7] [formerly d5d0fab53b [formerly 8208d756c7 [formerly e4ef1dff4330a64ee3a01a03ca5293ae75fd2fab]]]
Former-commit-id: d5d0fab53b
Former-commit-id: bed476bf2460c8360b48e732fa9f1b178615b422 [formerly a34777a738]
Former-commit-id: fd3a19a73c
|
2013-10-11 11:21:18 -05:00 |
|
Brad Gonzales
|
ff0ec3ddc6
|
Issue #1797 Refactored registry Time objects to simplify serialization issues.
Amend: Removed OpenDAPRetrievalGenerator.java from the review.
Fix GriddedTime addCycles when cycles are empty.
Change-Id: I9fa27178e5f59252cb872314493256be7f038890
Former-commit-id: 718fea35a1 [formerly ac3d87c397] [formerly 25710edd9e] [formerly bc87f2a168 [formerly 25710edd9e [formerly a01619f78bac065e7d42e28882157778aba09b75]]]
Former-commit-id: bc87f2a168
Former-commit-id: 80e942a0903682ada751fb617334acdf3cd8b6d9 [formerly 897fdfc2f6]
Former-commit-id: 5825fa41d6
|
2013-10-11 10:36:53 -05:00 |
|
Max Schenkelberg
|
98b60f0050
|
Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104.
Amend: Accepted ticket, cleanup, comments
Change-Id: I78649dd0268b030624888544740a8d7af3e83e97
Former-commit-id: c2471fd381 [formerly b64050ff1e] [formerly 7a66a3c995] [formerly 01c0e022d5 [formerly 7a66a3c995 [formerly fb196f5b8659e568ea1406cc5c5e01aa82525a76]]]
Former-commit-id: 01c0e022d5
Former-commit-id: d2fa57de0fb4cdcad01f1ef6e1a474065d10bc48 [formerly cf0ad44ee3]
Former-commit-id: dfd6ffabd8
|
2013-10-11 10:21:37 -05:00 |
|
Ron Anderson
|
fd4a1ff6d3
|
Merge "Issue #2361 fix iscUtil" into development
Former-commit-id: fe072b8a46 [formerly 1d74ec7b95] [formerly 3e260a58d9] [formerly 584a782545 [formerly 3e260a58d9 [formerly 52834c2c4a82218588f2725c3ea12c4ce8e3dc14]]]
Former-commit-id: 584a782545
Former-commit-id: 82f9833f21f1dafefc410114667acf49e4900722 [formerly d13c6943da]
Former-commit-id: e421c4c24f
|
2013-10-10 18:03:36 -05:00 |
|
Nate Jensen
|
d3e0340f3d
|
Issue #2361 fix iscUtil
Change-Id: I4f62e048db3c1b453f56ece98448e1cf8b35fc28
Former-commit-id: 9061866d58 [formerly fa2a7db710] [formerly 8aecb21306] [formerly dc60f94a34 [formerly 8aecb21306 [formerly 93ec0db0ac9adeab663fa18f2d93eb9a42e4302b]]]
Former-commit-id: dc60f94a34
Former-commit-id: 4f809ea030f0b5f024efb499a22c552717e6efbe [formerly ef92804824]
Former-commit-id: a75c66778b
|
2013-10-10 17:38:01 -05:00 |
|
Ben Steffensmeier
|
babdf64cc4
|
Issue #2376 Fix STI parsing
Change-Id: Ifcf0829f187a2fb96258cb3706e52bb1ba725fe5
Former-commit-id: 0f77e750f6 [formerly 29f3ac17f1] [formerly abf0df45c4] [formerly f1699b1d62 [formerly abf0df45c4 [formerly 4af47a67091e0249c01289f275d44756f04e50d3]]]
Former-commit-id: f1699b1d62
Former-commit-id: 0792017648e0b6674aed4c03b8d36b760d6405c7 [formerly 5abf856ccb]
Former-commit-id: 9066930aec
|
2013-10-10 15:47:54 -05:00 |
|
Richard Peter
|
7dc72f9bba
|
Merge "Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes." into development
Former-commit-id: a4b1eb9dff [formerly e717ae510b] [formerly 8f67035519] [formerly d7db5d0219 [formerly 8f67035519 [formerly 3a704d8d903afc5629a13f478af585947954b5d2]]]
Former-commit-id: d7db5d0219
Former-commit-id: 68223945005706fda2640591654c8d7d4815f98e [formerly 6eae16a7dc]
Former-commit-id: 3fec426da2
|
2013-10-10 11:34:11 -05:00 |
|
Richard Peter
|
d791e5c640
|
Merge "Issue #2466 Returned to original harvesterThreadPool Change-Id: Ia894f9e0330b1ae6f89a3bd3496e25085ad90b5d" into development
Former-commit-id: 8ed2c3a117 [formerly f03832c79b] [formerly a3e361323c] [formerly fde5182264 [formerly a3e361323c [formerly 2d49ceead68df56e96c38652ab1c7df543f0f6d5]]]
Former-commit-id: fde5182264
Former-commit-id: ae58cf5f06a38fa19ac868fb2cea93fba494a9a4 [formerly 825b01404e]
Former-commit-id: ab702730a1
|
2013-10-10 11:05:45 -05:00 |
|
Dave Hladky
|
e4d7d2d8c1
|
Issue #2466 Returned to original harvesterThreadPool
Change-Id: Ia894f9e0330b1ae6f89a3bd3496e25085ad90b5d
Former-commit-id: 843f83e4a4 [formerly 36667033b2] [formerly 38a6b4e811] [formerly e6931e8454 [formerly 38a6b4e811 [formerly 26316e71831c51e3ee96a1afd9ef213f1d87beff]]]
Former-commit-id: e6931e8454
Former-commit-id: 51ee30687642864aed2161fc719cf2fd1f327376 [formerly 750b8aa13e]
Former-commit-id: edec7221f4
|
2013-10-10 10:47:44 -05:00 |
|
Nate Jensen
|
b726353f42
|
Merge "Issue #2361 remove ISerializableObject for some pointdata and user roles classes" into development
Former-commit-id: 038f48e28f [formerly 55d1d12c38] [formerly b3fdf129db] [formerly 2934222c09 [formerly b3fdf129db [formerly 7a2dd6ccb98c9b7b28b989835b6ed6535f7a6ce1]]]
Former-commit-id: 2934222c09
Former-commit-id: 71820d3260124a01642944c128826c4f9ea4e3b9 [formerly ed0c5355c5]
Former-commit-id: 2c9dcd242b
|
2013-10-10 10:09:46 -05:00 |
|
Bryan Kowal
|
331115a9e5
|
Fix Merge Issue.
Former-commit-id: 66eb9a1983 [formerly 62db4d7b07] [formerly 21df04ff39] [formerly db25d33a4d [formerly 21df04ff39 [formerly 91716e4f6eb81153afa48266cdd43e3239864301]]]
Former-commit-id: db25d33a4d
Former-commit-id: f179478893abf5c2314388f9c1627b156e2a7ac8 [formerly 1263d95220]
Former-commit-id: e130d1ce58
|
2013-10-10 10:04:26 -05:00 |
|
Steve Harris
|
13873d55c2
|
13.5.2-9 baseline
Former-commit-id: 0093ce47a8 [formerly fdbef0e663] [formerly a28a2d3041] [formerly f36cf09d21 [formerly a28a2d3041 [formerly 948fc5e8cbbb6fa563e871417e455638fcbe154f]]]
Former-commit-id: f36cf09d21
Former-commit-id: 9c502fedcbd501781ba7a8be644ea45c55cc5e52 [formerly 45c58e1cb3]
Former-commit-id: 7d0416293f
|
2013-10-10 10:55:20 -04:00 |
|
Nate Jensen
|
55d62190fa
|
Issue #2361 remove ISerializableObject for some pointdata and user roles classes
Change-Id: I8a4a53dd1139a376aaa001bb7fef38444d8db005
Former-commit-id: 8d5b0ce4ea [formerly 5c185a4ec2] [formerly 0cff122d9c] [formerly d635901828 [formerly 0cff122d9c [formerly 3fa7b3de6733842c240959030023e84c844ef760]]]
Former-commit-id: d635901828
Former-commit-id: b77f65f419eaadf2463d896792881b416b2ab16a [formerly 25b219c49f]
Former-commit-id: d6c42a4edd
|
2013-10-09 18:03:11 -05:00 |
|
Brad Gonzales
|
74df786a0b
|
Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes.
Change-Id: I601b306bf944d959da05af9277ba80e184d98e30
Former-commit-id: 094c9dc6a7 [formerly 59f22b866a] [formerly 73e757c284] [formerly 61448cc04a [formerly 73e757c284 [formerly f776626738e4cc995bb16e87b8da66ff90289bd8]]]
Former-commit-id: 61448cc04a
Former-commit-id: 3686551f045361598f2adaa4edad79f481b0d4e1 [formerly 55d242b86d]
Former-commit-id: aff77aa148
|
2013-10-09 17:58:12 -05:00 |
|
Bryan Kowal
|
0b923f47dd
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
Former-commit-id: 740c53e49e [formerly 82559064ef] [formerly 37d1dd492b] [formerly 2b26c4c242 [formerly 37d1dd492b [formerly 2e6b76af19b308392e90dfee4c950200ec5c2560]]]
Former-commit-id: 2b26c4c242
Former-commit-id: 15d79cf54ce977ffbd4be67b9b37cb4278fb7560 [formerly daeb4b7ecb]
Former-commit-id: 68434c23ef
|
2013-10-09 17:07:10 -05:00 |
|
David Gillingham
|
dedc61720d
|
Issue #2418: Fix parameter naming issue in PHISH parameter info file.
Change-Id: I96dc326eba20ffa7c267248fd12343347e1ea93b
Former-commit-id: a3fe29cdfc [formerly 5e2157c933] [formerly dda31532a4] [formerly d0091e0f84 [formerly dda31532a4 [formerly c1244e64aeeda450462592bb46ea6bede17ee219]]]
Former-commit-id: d0091e0f84
Former-commit-id: 0bbe82a97084e5cbe2290d616171d00b64f5188a [formerly 303a8802ef]
Former-commit-id: 2ae3f7b9f3
|
2013-10-09 14:44:55 -05:00 |
|
Ron Anderson
|
c3a7a832db
|
Merge "Issue #2418: Add display support for pSurge 2.0 data in GFE." into development
Former-commit-id: 2c1c626095 [formerly e8e47e87b0] [formerly ce3c7b317704912577a74729932e7ea3e0e0eee9 [formerly f3118d421c]] [formerly d66c9d7322 [formerly f3118d421c [formerly 3b0b5e51da60b3b5d347d7325be376abb5902da8]]]
Former-commit-id: d66c9d7322
Former-commit-id: dc7c32cd697ac548fb0ea0454b19821714398f4b [formerly 5cea601f85]
Former-commit-id: 5812db03e2
|
2013-10-09 14:00:21 -05:00 |
|
Richard Peter
|
57c11e762e
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar
edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
rpms/awips2.cave/Installer.cave-feature/component.spec
Former-commit-id: ca61898cb4 [formerly 62b322c18d] [formerly 1a664aed21] [formerly c0643db0ba [formerly 1a664aed21 [formerly fee86c220c12c09c714245fa8666bc08f4f9775b]]]
Former-commit-id: c0643db0ba
Former-commit-id: 015b66f07af3e9d194a45a1c6b1ca9257fb5ff94 [formerly ecba2f7317]
Former-commit-id: 1c74c3cbde
|
2013-10-09 13:14:06 -05:00 |
|
Richard Peter
|
a62c0c89f0
|
Merge "Issue #2402 Modify grib decoder to work on file extents. Change-Id: I61ffe0a038b5c4f80c78e00fde652a9c87ca96b9" into development
Former-commit-id: d2b5823a5d [formerly fcb0b32ae2] [formerly d8df407119] [formerly 117c82a06d [formerly d8df407119 [formerly 06caa25b31163ceb228982fc7e5e51b5bc8f33a0]]]
Former-commit-id: 117c82a06d
Former-commit-id: 098a678163bad68244b64c738657d1a25861555c [formerly a6f7a7ca7f]
Former-commit-id: 52c9791172
|
2013-10-09 13:13:18 -05:00 |
|
Ben Steffensmeier
|
ac95afdc52
|
Issue #2402 Modify grib decoder to work on file extents.
Change-Id: I61ffe0a038b5c4f80c78e00fde652a9c87ca96b9
Former-commit-id: d9f383217f [formerly c896c9bf30] [formerly 7d2b48de48] [formerly 2b089b0848 [formerly 7d2b48de48 [formerly 1525772d1b42348f0eca78fc966d2c7878496ea7]]]
Former-commit-id: 2b089b0848
Former-commit-id: 0d5227b724cd17eaba30e60c17888c90e0ec5d1f [formerly 633a075052]
Former-commit-id: 7c6a89b623
|
2013-10-09 12:50:02 -05:00 |
|
Ben Steffensmeier
|
045c78cf19
|
Issue #2457 Improve error messages for missing radar icao.
Former-commit-id: 5fe6750c52 [formerly c43f3e11a6] [formerly 52beccc5c9] [formerly 7c8a3b80fa [formerly 52beccc5c9 [formerly ef0680d3f4acfa64d90af2e074f6642d1386d3ab]]]
Former-commit-id: 7c8a3b80fa
Former-commit-id: 002ff563fe4ca9a4b1f11fe8f5e344bd82427521 [formerly 070e2cfdac]
Former-commit-id: 18c59f3573
|
2013-10-09 12:11:27 -05:00 |
|
Nate Jensen
|
941a19ec45
|
Merge "Issue #2402 Make PythonDecoder more extendable." into development
Former-commit-id: ad19fcbd3c [formerly e0cbf2e05f] [formerly 7cecf177fe] [formerly 2d25d9e46a [formerly 7cecf177fe [formerly 3daa3f8284a5a65657429503c055ab34c1ebfb48]]]
Former-commit-id: 2d25d9e46a
Former-commit-id: 8141501f8e4bab22b63e925b68fc97ace6d52f88 [formerly 9ca9bd05a0]
Former-commit-id: c026672fe1
|
2013-10-08 16:20:43 -05:00 |
|
Bryan Kowal
|
3534686eb5
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/CombinationsInterface.py
cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/FFG_TIR_HIRES/FFG_TIR_HIRES.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar
edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SmartInitRequestHandler.java
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
edexOsgi/com.raytheon.uf.edex.ogc.common/com.raytheon.uf.edex.ogc.common.ecl
edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/com.raytheon.uf.edex.plugin.grib.ogc.ecl
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/python.site-packages/Installer.qpid/component.spec
Former-commit-id: ab10c1dd5b [formerly bb5ef114d1] [formerly aa4ea792c1] [formerly 542f5f2349 [formerly aa4ea792c1 [formerly 606030384b5fe1eb9411d4b35d3282b15b1398b4]]]
Former-commit-id: 542f5f2349
Former-commit-id: 518cc2598c60d171ae83c427ee2062c4d7ef8025 [formerly 5d5ccb7599]
Former-commit-id: de61382dc7
|
2013-10-08 14:44:38 -05:00 |
|
Richard Peter
|
873d2bf184
|
Merge branch 'omaha_13.5.3' (13.5.2-8) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
edexOsgi/build.edex/esb/conf/spring/edex.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml
Change-Id: I1006c3ccd0f643cc673813c4305470fd006da371
Former-commit-id: 1af5b95d92 [formerly f141fdd5ab] [formerly 9adbe25ceb] [formerly b6395cc834 [formerly 9adbe25ceb [formerly 687a47c58a0db2bb82328ffd4e36e7b3fabca542]]]
Former-commit-id: b6395cc834
Former-commit-id: 2c457acf95f4418fe275e09d6d24693aa278fc9b [formerly 3abe952ca0]
Former-commit-id: 0e7dccd18f
|
2013-10-08 10:59:50 -05:00 |
|
Richard Peter
|
605a825c3a
|
Merge "Issue #1797 Fix p2 build for tests, removed ISerializable deprecrated calls form reg objects" into development
Former-commit-id: 8d685ae419 [formerly f7ae6aae92] [formerly 28760a1273] [formerly 7a4ed8bea4 [formerly 28760a1273 [formerly fd76d3a72bd18a2afdce5855173a5a9b9ad9e00b]]]
Former-commit-id: 7a4ed8bea4
Former-commit-id: a6096c75637f44fedac9a8bfb4d95837328c1a2e [formerly 0b1f6e2c9b]
Former-commit-id: f28a0c025e
|
2013-10-08 10:50:59 -05:00 |
|
Bryan Kowal
|
ef0e6ede56
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
rpms/awips2.qpid/0.18/deploy.builder/build.sh
Former-commit-id: 80c2ccd547 [formerly 96c800f3f4] [formerly 5eba3290c8] [formerly 8f14318bc7 [formerly 5eba3290c8 [formerly d6b9ed6ec29c5285ec454fb1c1e65e64a096edb9]]]
Former-commit-id: 8f14318bc7
Former-commit-id: d3917f8d40a980b637b27fc44df2b93eff0d5796 [formerly 53af4c7284]
Former-commit-id: 72ed6c5f7a
|
2013-10-08 10:35:03 -05:00 |
|
Dave Hladky
|
62c7b8a83b
|
Issue #1797 Fix p2 build for tests, removed ISerializable deprecrated calls form reg objects
Former-commit-id: 521cb3a61d [formerly 4867082be1] [formerly fbe4078bc5] [formerly ad1bb73c70 [formerly fbe4078bc5 [formerly c299ed7a5bb02980ecb30b0ab38752d2878d50a7]]]
Former-commit-id: ad1bb73c70
Former-commit-id: 91f21451dc2485422212959320afb62a1b8190e7 [formerly 093b41499b]
Former-commit-id: 445d836fe6
|
2013-10-08 10:25:36 -05:00 |
|
Richard Peter
|
af9c4be87a
|
Merge branch 'master_13.5.3' (13.5.2-8) into omaha_13.5.3
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
Former-commit-id: f84e84989b [formerly f0c05dc6d8] [formerly 31c87ab01e] [formerly d9eae3ea28 [formerly 31c87ab01e [formerly 3ffd20d6abb05be289fb94513e78c0137f566a53]]]
Former-commit-id: d9eae3ea28
Former-commit-id: ff84474d44083bc5676fa6731229af076e27cb80 [formerly f4b47dda50]
Former-commit-id: 94d0913bd9
|
2013-10-08 09:45:27 -05:00 |
|
Max Schenkelberg
|
8d83725f8b
|
Issue #2081 Created custom dataURI field converter interface for use with DataTime so toString can be left unchanged (with spaces) and dataTimes in the dataURI will also be left unchanged (with underscores). Refactored DataURIUtil to support these new field converters.
Change-Id: I0a3983b04a475f6fcf5f70ee89cecf6dd2e67676
Former-commit-id: 86f38edeac [formerly 0e1a4fdf96] [formerly 1bc2e9aa2b] [formerly 782ec43213 [formerly 1bc2e9aa2b [formerly 86788ab1704c381fc2d26b1891e37aed7367fd3d]]]
Former-commit-id: 782ec43213
Former-commit-id: 3da149ba88c46d6af3cc067262f89258c997b007 [formerly d1e5c9d9e2]
Former-commit-id: 347fd2bfe0
|
2013-10-08 09:34:08 -05:00 |
|