Richard Peter
|
b29e037e05
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cots/org.jep.linux64/libjep.so
Change-Id: Ib01663f1b3be2671b90a35af2fcfc73cc6b0635d
Former-commit-id: 9b5d2fa69f [formerly f69bbf7952] [formerly cb33f5ada7] [formerly 14d5b8656e [formerly cb33f5ada7 [formerly 81a1af882e3fa8703e3b4b6bb687a1ab9710b386]]]
Former-commit-id: 14d5b8656e
Former-commit-id: e43a9bab4c68a481f2c9959d56447b4b556d21ba [formerly 6ecb80e892]
Former-commit-id: a49c67203e
|
2013-10-23 15:50:25 -05:00 |
|
Nate Jensen
|
20f05bb5f6
|
Merge "Issue #2361 once again try to remove more common ISerializableObject" into development
Former-commit-id: dd641d8c1a [formerly d3a21bc431] [formerly 4c7bee41a7] [formerly 65962ae15a [formerly 4c7bee41a7 [formerly 5ec014c2fccf9b5e417738310b50beccd70ee62d]]]
Former-commit-id: 65962ae15a
Former-commit-id: f1ec56fa0b5f76ec6ff24f29eb75e8200ccfbdb2 [formerly 6bd779e459]
Former-commit-id: 56be5c199e
|
2013-10-23 14:00:28 -05:00 |
|
Nate Jensen
|
5c2e8c802f
|
Issue #2361 once again try to remove more common ISerializableObject
Change-Id: I149fa1009b2d85b2c2f5e9247515eecb835dad09
Former-commit-id: a085291451 [formerly 46edfda4da] [formerly 40d8e42b87] [formerly 4b80a31f22 [formerly 40d8e42b87 [formerly 05585a1d0f9fdab55c8ad2ce83d8e979450521ba]]]
Former-commit-id: 4b80a31f22
Former-commit-id: deae503ad96698888f88175ce8cef56e53c6078d [formerly f782d20320]
Former-commit-id: 1742f9a3fa
|
2013-10-23 11:40:13 -05:00 |
|
Richard Peter
|
c2514c8bdd
|
Merge "Issue #1538 Made http timeouts configurable on registry service http connections" into development
Former-commit-id: 8dc43c5bc1 [formerly d7036ceeb4] [formerly 4776e83979] [formerly 9cf347fe7f [formerly 4776e83979 [formerly a12bc6ddd2fd4388fc541015926e2e51aa40e090]]]
Former-commit-id: 9cf347fe7f
Former-commit-id: b0d2a2ed02d8a815274915d8dfbbf4e797fb3dd5 [formerly 7e171abbb8]
Former-commit-id: 1724640945
|
2013-10-23 10:01:00 -05:00 |
|
Benjamin Phillippe
|
2cd2b88750
|
Issue #1538 Made http timeouts configurable on registry service http connections
Change-Id: I2f91b713475027a3e514d0fd98605fc83bdac447
Former-commit-id: 23af775648 [formerly 71168e4791] [formerly dd57ea1cd4] [formerly 2c39b78ded [formerly dd57ea1cd4 [formerly cf9f51098a2778f747984940a764ab5089afd231]]]
Former-commit-id: 2c39b78ded
Former-commit-id: dd5a45642652d7ef7fb50f8716df3e35f4f3ad6b [formerly 16b21fe41c]
Former-commit-id: d9fbb6737e
|
2013-10-23 09:57:52 -05:00 |
|
Nate Jensen
|
b1a5a615f3
|
Merge "Issue #2333 Merging gl refactor from GOES-R work. Preparing GL for data units in image." into development
Former-commit-id: 09ec04b9f4 [formerly 4aa40ad61a] [formerly 50bf735240] [formerly aa0554d073 [formerly 50bf735240 [formerly 41462b804bf079368bead7c1271b1abdb7d4bf63]]]
Former-commit-id: aa0554d073
Former-commit-id: ae45b51290b85ce8a744919e605659b1f78cc2cc [formerly d8a821746c]
Former-commit-id: a58f2a6c10
|
2013-10-21 14:44:17 -05:00 |
|
Ben Steffensmeier
|
ff1eaaf4b4
|
Issue #2379 Fix bufrssmi null pointer exception.
Former-commit-id: 6ad2a699d3 [formerly 9d749300cb] [formerly 7a82e94390] [formerly 02264afc30 [formerly 7a82e94390 [formerly 1fa24e52c8d5bded0bc60f14c13e88f9c33ed895]]]
Former-commit-id: 02264afc30
Former-commit-id: 94e0cfde01177d63de591f831acf4131122e97db [formerly bc7ed15ce5]
Former-commit-id: 8c0885db2d
|
2013-10-21 13:19:03 -05:00 |
|
Richard Peter
|
55fef9db2b
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 5f838e4573 [formerly cab9619532] [formerly 556cebeff9] [formerly 17d8bd319d [formerly 556cebeff9 [formerly 1a2207e085ad7d30ffad56f42fa3d28c584a8a08]]]
Former-commit-id: 17d8bd319d
Former-commit-id: 372a7c3ca36d4d893ececd3dacf1355093854138 [formerly bb03c736ce]
Former-commit-id: 4e53ede48c
|
2013-10-20 21:56:33 -05:00 |
|
Benjamin Phillippe
|
69f8efc8d6
|
Issue #1682 Fixed replication/query errors and added synchronous notification delivery
Change-Id: Ia6a07c3abf6c48ef18d354dc2866ed981e6f1478
Former-commit-id: d0e72c91fc [formerly c88eb406bf] [formerly 64b0a4d065] [formerly d94f22fda8 [formerly 64b0a4d065 [formerly 2f6dc771e86cf290bb72743f1855f02c616e57d5]]]
Former-commit-id: d94f22fda8
Former-commit-id: 5de22c44f318ece31c6105adf801e2c7d76a5903 [formerly 9153069a87]
Former-commit-id: 8c85c73660
|
2013-10-20 16:02:10 -05:00 |
|
Benjamin Phillippe
|
40ccc490a4
|
Issue #1682 Refactored Registry querying to conform to EBXML 4.0 spec
Change-Id: If6d3579305afbb279057a264033736fc126b7849
Former-commit-id: 9bc1058db1 [formerly 12d23800c7] [formerly a4e5cd5fd7] [formerly ed23a786d6 [formerly a4e5cd5fd7 [formerly 5112ee9931a1678fee37dd725a28dd6fff1e7ec9]]]
Former-commit-id: ed23a786d6
Former-commit-id: 0d452b3343313b1a38b897d43d2a6fef69eb7481 [formerly a51d2fe3b9]
Former-commit-id: 11b9198589
|
2013-10-18 09:20:40 -05:00 |
|
Steve Harris
|
9f45bcf5e3
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 65be1b928e [formerly 9a282049b0] [formerly f927209446] [formerly 67136a50f2 [formerly f927209446 [formerly 608378b8e086a845f38e238eda127c7792f09b53]]]
Former-commit-id: 67136a50f2
Former-commit-id: 8e3dca09afd27063e0daca5c2fb240d07113d443 [formerly a1544c7c74]
Former-commit-id: ef45113f4a
|
2013-10-17 18:20:56 -05:00 |
|
Max Schenkelberg
|
af48a7e839
|
Issue #2333 Merging gl refactor from GOES-R work. Preparing GL for data units in image.
Change-Id: I6ec7c0808516cc1ce87e3325b54041366392d191
Former-commit-id: 3ec1b334cd [formerly 08cafadf8f] [formerly 676493c6e2] [formerly 004720f7a9 [formerly 676493c6e2 [formerly b4249acf8655c2c31e491cf945f2bb4fc00f7fad]]]
Former-commit-id: 004720f7a9
Former-commit-id: 28d6f1e7606f37b873f1fed4610372d4a7014d7e [formerly 872652cab9]
Former-commit-id: df3b18d237
|
2013-10-17 12:59:23 -05:00 |
|
Ben Steffensmeier
|
09b63a0bb9
|
Issue #2402 decrease ingestGrib max memory.
Former-commit-id: def205a734 [formerly 127f7abab2] [formerly ed88949e9d] [formerly 62177dcea7 [formerly ed88949e9d [formerly e647c2bc33b696c1f45089e0d9560009071e34ef]]]
Former-commit-id: 62177dcea7
Former-commit-id: 9e42f89a554c7fe7f8c96b569be4ad1d634ab20f [formerly ee7009f8cf]
Former-commit-id: 513e42c5cf
|
2013-10-17 12:30:10 -05:00 |
|
Steve Harris
|
1aabbf3a48
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 3c454bf7c9 [formerly c320bd2f81] [formerly 17ce229623] [formerly f87858a67c [formerly 17ce229623 [formerly 27ef21af38cf81037a6d819d409cf7981bec7028]]]
Former-commit-id: f87858a67c
Former-commit-id: 9ede86de3ae6d66385178b974f9a5c97bdf094ba [formerly bc7fc16a4a]
Former-commit-id: c8ad5d903f
|
2013-10-17 09:26:10 -05:00 |
|
Brad Gonzales
|
70a9b07483
|
Issue #2267 Reverted HibernateBandwidthInitializer to check for local only.
Change-Id: If51cad02663bf584f90588c8586c2215340fc1e4
Former-commit-id: 38c9eeed8e [formerly d943481576] [formerly a86b767af4] [formerly eb7a1ebf62 [formerly a86b767af4 [formerly 1b9ac343acea0eb70cada015e6af257058217f36]]]
Former-commit-id: eb7a1ebf62
Former-commit-id: 6b577c9dbb8b5b2c3a298282454f0d86580f9ee2 [formerly f8fc02cdfc]
Former-commit-id: 825fcf55af
|
2013-10-16 17:03:17 -05:00 |
|
Steve Harris
|
4044fca7d8
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: d9e952066a [formerly f2f25e0d24] [formerly 1d321b3f2c] [formerly 777da949d7 [formerly 1d321b3f2c [formerly 0fd535fb95343956cda9e96ebb5aa5c56387da72]]]
Former-commit-id: 777da949d7
Former-commit-id: 89810042f2ff379e76548931e65f9ee71525f009 [formerly fcbf80b05a]
Former-commit-id: a6d96b87a0
|
2013-10-16 17:01:21 -05:00 |
|
Nate Jensen
|
d5f4a38b36
|
Merge "Issue #2473 Clean up grib plugin." into development
Former-commit-id: 7bf61fad14 [formerly 1f801da99f] [formerly 7e7d375cea] [formerly 1f44eb5e8d [formerly 7e7d375cea [formerly 4d0cc0385afc3a0e4f1789d6f6d88c26fcbdf386]]]
Former-commit-id: 1f44eb5e8d
Former-commit-id: 8705ddcac93460d7604302b13f118ff4797c9f8b [formerly 475d94751a]
Former-commit-id: 5d1465347f
|
2013-10-16 15:26:20 -05:00 |
|
Steve Harris
|
9aeacf4dab
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 9f7f030e2d [formerly b702ec9521] [formerly fb8b8c221e] [formerly d173ac97e0 [formerly fb8b8c221e [formerly deaff8aefae6514ab261812987ce094e43fa017a]]]
Former-commit-id: d173ac97e0
Former-commit-id: 7e17724b464660bf48f1075b72e5d212dda89e6f [formerly 6e16c3c0d6]
Former-commit-id: 6938093b4d
|
2013-10-16 11:07:44 -05:00 |
|
Ben Steffensmeier
|
4f7d1ac3cd
|
Issue #2473 Clean up grib plugin.
Former-commit-id: 0b3565ed1c [formerly c7cfc6aaf6] [formerly 4a17225301] [formerly ae9e1160e8 [formerly 4a17225301 [formerly 6fda3bf42a0735ecb5ae9f7ef1ae0e08dac22a5b]]]
Former-commit-id: ae9e1160e8
Former-commit-id: 5436916453fe5d858877adf4340a0548d19ce74f [formerly 297109c181]
Former-commit-id: 5d12980041
|
2013-10-16 10:47:30 -05:00 |
|
Dave Hladky
|
aa5fd1ba3f
|
Issue #2460 Product browser display of adhoc subscriptions
Change-Id: I9c045b781adb41468d395b67a837c9a862744447
Former-commit-id: e14b51258b [formerly 7b6ef7ee9a] [formerly 6076f46549] [formerly 477fbd3d59 [formerly 6076f46549 [formerly c504c44750f5f441be41c20fdb78a363c620fb3d]]]
Former-commit-id: 477fbd3d59
Former-commit-id: a483ea67e7e78c9b17eaf6a48fb26ebec56271c3 [formerly 639019eff1]
Former-commit-id: 9880c82a36
|
2013-10-16 09:06:00 -05:00 |
|
Richard Peter
|
bd18628df9
|
Merge "Issue #2473 Remove unneeded ncgrib functionality. Change-Id: If38138650660c75745091a82c231cd0fe8c92e38" into development
Former-commit-id: 596907fdf1 [formerly 74d34e7fb3] [formerly 9b987e8000] [formerly e1a0403c01 [formerly 9b987e8000 [formerly 1fb60210f841ee2ee9f127db33fe30df4222ff57]]]
Former-commit-id: e1a0403c01
Former-commit-id: 020e5955a6649bd7d4bb4c47058c6a42a54c0392 [formerly 4c983c7429]
Former-commit-id: 00f89efbca
|
2013-10-15 16:36:38 -05:00 |
|
Ben Steffensmeier
|
50f81cf656
|
Issue #2473 Remove unneeded ncgrib functionality.
Change-Id: If38138650660c75745091a82c231cd0fe8c92e38
Former-commit-id: 0c0e339894 [formerly 10f74a1812] [formerly d25df40634] [formerly 51cd71c373 [formerly d25df40634 [formerly 49a3700d37c07f42991f7ca4a65f0fd4c7010f91]]]
Former-commit-id: 51cd71c373
Former-commit-id: 91c71836947d0b2aea377fc28fa97fda33b6fd59 [formerly 24a6795677]
Former-commit-id: dcae8c6aa2
|
2013-10-15 16:30:38 -05:00 |
|
Nate Jensen
|
84b16b89b5
|
Issue #2361 Added startup timing statements
Change-Id: I347b3e671ecd7c7c61b88e008e2d4c56d19e6108
Former-commit-id: 0d7d2257cc [formerly 3f107e931f] [formerly 323f594de4] [formerly d265f4ddf4 [formerly 323f594de4 [formerly 3f93aeeb8259600b1c6e0ff47641ff95337df605]]]
Former-commit-id: d265f4ddf4
Former-commit-id: 02d772fe8febbecc8657a8eacb5c61f6d3d41e3e [formerly d72a7f3c69]
Former-commit-id: 521c019757
|
2013-10-15 14:23:59 -05:00 |
|
Richard Peter
|
210927720b
|
Merge branch 'omaha_13.5.3' (13.5.2-10) into development
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
Former-commit-id: cbf18e7a32 [formerly cbf53120dd] [formerly 9264b9c5559b76abd686cb8133cdc03e7ea2acc7 [formerly cd504e4e98]] [formerly 0787e7cc86 [formerly cd504e4e98 [formerly 1af6e051089c8f0a216307647e044d19d41f6828]]]
Former-commit-id: 0787e7cc86
Former-commit-id: 36f2423845a35dba4181db0c68f0634fbfc9eaef [formerly 1a62020265]
Former-commit-id: 9896b051c1
|
2013-10-15 11:36:12 -05:00 |
|
Nate Jensen
|
c328d581cc
|
Merge "Issue #2361 remove XML annotations and IDecoderGettable from a variety of plugins" into development
Former-commit-id: 9acb414570 [formerly 78f641d082] [formerly 040918f9a4] [formerly d7c9a39d16 [formerly 040918f9a4 [formerly 445f2c0779e98ed7277c8ff95552d062f7b70197]]]
Former-commit-id: d7c9a39d16
Former-commit-id: d3bb0beba9a02cac129348cbac085050de08447d [formerly 7256edab5a]
Former-commit-id: 4e5db943b2
|
2013-10-15 11:21:39 -05:00 |
|
Ben Steffensmeier
|
57a93ec3b8
|
Issue #2402 Up grib split to 2 threads make it configureable.
Former-commit-id: 5facc316a8 [formerly b089df5ca1] [formerly d644235fe1] [formerly 29e77f2e6c [formerly d644235fe1 [formerly f3308c200407bae39175f2620559c6489aa5c788]]]
Former-commit-id: 29e77f2e6c
Former-commit-id: 5f642b260d2dce3d25572a8f35b68043bb3074e4 [formerly 4f7eca694d]
Former-commit-id: f82a3ee63f
|
2013-10-15 10:59:50 -05:00 |
|
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 |
|