Mark Peters
eda9693e85
Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin
...
Change-Id: I1dc26f81d0a6f39b86eb1e832c7204d8b6ce3348
Former-commit-id: ffe3444650
[formerly 955f21a85c
] [formerly ffe3444650
[formerly 955f21a85c
] [formerly fb62a1e35b
[formerly 475fa37d70d51e5e9538141730fbead4a6b5d88e]]]
Former-commit-id: fb62a1e35b
Former-commit-id: 77da058a9f
[formerly 6315da5482
]
Former-commit-id: f9d5dca0e5
2014-10-02 15:36:22 -05:00
Brian.Dyke
572bbdd019
Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: db665d3876
[formerly 2a911984f0
] [formerly db665d3876
[formerly 2a911984f0
] [formerly 20dd249d2c
[formerly 441fc7561a8526422f9b73b9c47cd220f0babb54]]]
Former-commit-id: 20dd249d2c
Former-commit-id: 46956a01c6
[formerly 72ea2fbe48
]
Former-commit-id: a3ccdd9704
2014-10-02 10:44:50 -04:00
Brian.Dyke
e100894074
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 006bdb00ad
[formerly 65ad6056b6
] [formerly 006bdb00ad
[formerly 65ad6056b6
] [formerly f3f95aabb0
[formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]]]
Former-commit-id: f3f95aabb0
Former-commit-id: d174db3b0c
[formerly e77f1e126e
]
Former-commit-id: 1d2dfd264a
2014-10-02 10:38:51 -04:00
Brian.Dyke
c853463f73
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: d4888adc0f
[formerly f47840e4d9
] [formerly d4888adc0f
[formerly f47840e4d9
] [formerly 2ac30f6c22
[formerly ece734cb6218a80fa2dda1b3c43673dc5a31bfbb]]]
Former-commit-id: 2ac30f6c22
Former-commit-id: 277b6e4b36
[formerly 36d377e08d
]
Former-commit-id: 7e465baead
2014-10-02 10:24:04 -04:00
Brian.Dyke
0fa5e7da1a
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 31f073ee3a
[formerly 4bc465bfbd
] [formerly 31f073ee3a
[formerly 4bc465bfbd
] [formerly 97464ea153
[formerly f26e54011d334972bb1e999304b1b2d13a1c408f]]]
Former-commit-id: 97464ea153
Former-commit-id: 0915cb28b0
[formerly e76ee74410
]
Former-commit-id: 1d5c3fb6d4
2014-10-02 10:15:34 -04:00
Steve Harris
18d68410e5
Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1
...
Former-commit-id: 09d8955b31
[formerly e201e1a493
] [formerly 09d8955b31
[formerly e201e1a493
] [formerly cc34483b0b
[formerly ace8473f96c6151918ee8ecf61e3b8986d98a68a]]]
Former-commit-id: cc34483b0b
Former-commit-id: 8a627b9bf6
[formerly d711c1b67b
]
Former-commit-id: 074e12da64
2014-10-02 08:09:02 -05:00
Slav Korolev
55c7492692
Issue #3659 - Enabled to display HFR-EAST_6KM or HFR-WEST_6KM data as a Time Series
...
Former-commit-id: 05a7f534bf
[formerly f7bcb81010
] [formerly 05a7f534bf
[formerly f7bcb81010
] [formerly ad4bae10c9
[formerly 2a03c64bb098a141c82aac4bab42d7d9f4a6296f]]]
Former-commit-id: ad4bae10c9
Former-commit-id: c00a8eb707
[formerly 8fddad1cd1
]
Former-commit-id: f05360e224
2014-10-01 16:45:33 -04:00
Shawn.Hooper
5a228f5a5c
ASM #15033 - Fix IBW templates and 14.2.1 template corrections
...
Change-Id: I2677b93f897640318d8f89da72e49ba398d1d720
Former-commit-id: 22c3fde0ef
[formerly f9428ace1f
] [formerly 22c3fde0ef
[formerly f9428ace1f
] [formerly ae02cbc2da
[formerly ea8e4c3a30bceb2f3b53159317382ae651aa5531]]]
Former-commit-id: ae02cbc2da
Former-commit-id: 9ecf241616
[formerly f2d7288970
]
Former-commit-id: e5b5160a51
2014-10-01 15:58:48 -04:00
Brian.Dyke
ea401b327b
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 0be927be2d
[formerly 5ed17c0e24
] [formerly 0be927be2d
[formerly 5ed17c0e24
] [formerly a4bfbea3c2
[formerly 622e63224b6d6bf1d6ced874658bbd9db381799b]]]
Former-commit-id: a4bfbea3c2
Former-commit-id: 4df4eb9c2b
[formerly 914da168c8
]
Former-commit-id: 8184df119d
2014-10-01 15:36:06 -04:00
Nathan Bowler
8f18ed535e
Omaha #3596 Update scripts to use DAF. Always put creatingEntity in returned attributes.
...
Change-Id: I456ff499ccf9446622d1535323afc0d0d1f9b70d
Former-commit-id: 2d5d90c055
[formerly 368b6341b0
] [formerly 2d5d90c055
[formerly 368b6341b0
] [formerly e4779f2e66
[formerly d67d1e941b89357e7d86fa0f810a82f9e01f4c27]]]
Former-commit-id: e4779f2e66
Former-commit-id: b52c1bcafd
[formerly a72fec1b38
]
Former-commit-id: ae5bde3c3d
2014-10-01 14:57:16 -04:00
dmsys
71d6e48473
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm
Former-commit-id: f704781f4f
[formerly 8c3625cfec
] [formerly f704781f4f
[formerly 8c3625cfec
] [formerly 9f4560c480
[formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]]
Former-commit-id: 9f4560c480
Former-commit-id: 07f84c6b26
[formerly b884e5e32d
]
Former-commit-id: e00ea2d8cd
2014-09-30 13:45:54 -04:00
Nate Jensen
a0cdaf33fe
Merge "Omaha #3629 Replacing matchElement()" into omaha_14.4.1
...
Former-commit-id: 5e97eb494e
[formerly 4569b23701
] [formerly 5e97eb494e
[formerly 4569b23701
] [formerly 3b0296cc99
[formerly 5861d0f99dd2f89a37f72736e139233ea3337605]]]
Former-commit-id: 3b0296cc99
Former-commit-id: 8ceb856440
[formerly fa29bf050e
]
Former-commit-id: 0eb6bd03d0
2014-09-30 11:58:02 -05:00
Richard Peter
27df0ccc12
Merge "Omaha #3622 Fix null pointer in ServiceBackupLockManager" into omaha_14.4.1
...
Former-commit-id: b81e0f4549
[formerly 9c0692f861
] [formerly b81e0f4549
[formerly 9c0692f861
] [formerly 02fb12501e
[formerly cac5f4e1c1f25ea1c5b9083410c1eeaf6b4af0f4]]]
Former-commit-id: 02fb12501e
Former-commit-id: a33c36417b
[formerly 4e05ef95b6
]
Former-commit-id: 0e13f93da4
2014-09-30 11:45:25 -05:00
Mark Peters
bc20d29233
Omaha #3629 Replacing matchElement()
...
Change-Id: Ie8ae1347a1aeb99532e42c7a3af7d200cf4c3a1e
Former-commit-id: 6a0703ad98
[formerly 6d59eb314d
] [formerly 6a0703ad98
[formerly 6d59eb314d
] [formerly 776420f2d9
[formerly 6f898cc3d7f30651846847c5645ec26ac448ec83]]]
Former-commit-id: 776420f2d9
Former-commit-id: 406c3795ee
[formerly d3c3ee2a61
]
Former-commit-id: 6c9aa42dba
2014-09-30 11:39:40 -05:00
Ron Anderson
0996164214
Omaha #3622 Fix null pointer in ServiceBackupLockManager
...
Change-Id: Idd29ac0b5330d9f2167c8fdc4acfd6e1ed961a99
Former-commit-id: 83e46bb3d6
[formerly 437f2fdc47
] [formerly 83e46bb3d6
[formerly 437f2fdc47
] [formerly 1c6fa09d4f
[formerly e6ae629d1667943ae7bf25598f32e2b479e748b1]]]
Former-commit-id: 1c6fa09d4f
Former-commit-id: ed2caa33af
[formerly 80ebbc73ef
]
Former-commit-id: b76b428114
2014-09-30 11:32:30 -05:00
Nate Jensen
23204510d8
Omaha #3671 turn on LZF compression of satellite hdf5 data
...
Change-Id: I6709fa5a262a0119d81d2b22745c2d4f67d649aa
Former-commit-id: 9158ce06e2
[formerly 7e3b5f973b
] [formerly 9158ce06e2
[formerly 7e3b5f973b
] [formerly 6a1ee6a5d0
[formerly 2f79d47e4ed5aaf316d54a442123b9906fa8d2b9]]]
Former-commit-id: 6a1ee6a5d0
Former-commit-id: 40b7f9b574
[formerly e288d38707
]
Former-commit-id: 534653c297
2014-09-30 10:58:21 -05:00
Steve Harris
d66d96dad8
Merge branch 'omaha_14.4.1' into omaha_pda
...
Former-commit-id: c68b6c47ae
[formerly 04546b20ef
] [formerly c68b6c47ae
[formerly 04546b20ef
] [formerly 797520a4e6
[formerly 0804064f01610ff9873e997c8a0d026002b7c571]]]
Former-commit-id: 797520a4e6
Former-commit-id: 3dfbf6b283
[formerly 36f643b290
]
Former-commit-id: 579a17baf2
2014-09-30 09:22:39 -05:00
Ron Anderson
c9dbc2a8bc
Omaha #3300 Merge #3661 and #3670 changes into 14.4.1 from 14.3.1_backports
...
Change-Id: I2be578791e61964c3e2fd6b2d810ef492056b69c
Former-commit-id: b948adc7d3
[formerly ec910127b6
] [formerly b948adc7d3
[formerly ec910127b6
] [formerly 3e3a2c2f70
[formerly 525cffa1ec2a999d97a5fc3ca2153c8241c534be]]]
Former-commit-id: 3e3a2c2f70
Former-commit-id: e9ba2ceb6b
[formerly be738e8f4b
]
Former-commit-id: 8136efe384
2014-09-30 08:44:01 -05:00
Steve Harris
4c4380580f
Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
Former-commit-id: 3598e9b5b6
[formerly 90e08b96e1
] [formerly 3598e9b5b6
[formerly 90e08b96e1
] [formerly 3b6a8a1447
[formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]]
Former-commit-id: 3b6a8a1447
Former-commit-id: 842abaad49
[formerly 6330a62e85
]
Former-commit-id: 30f0d27dfb
2014-09-29 12:58:56 -05:00
Steve Harris
d19a7675a9
Merge branch 'master_14.3.1' (14.3.1-21,22) into omaha_14.3.1
...
Former-commit-id: fdfe16985d
[formerly 46da726675
] [formerly fdfe16985d
[formerly 46da726675
] [formerly c03bc273da
[formerly 49ad8e0e780443a0439227694a92ec8ab683b125]]]
Former-commit-id: c03bc273da
Former-commit-id: dd92661aba
[formerly 7c37aaa92e
]
Former-commit-id: af7f1cf232
2014-09-29 11:14:32 -05:00
Ben Steffensmeier
a69ec7c7af
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
...
Former-commit-id: 6090625040
[formerly f92d021e96
] [formerly 6090625040
[formerly f92d021e96
] [formerly 5b10ac2f36
[formerly 00d314b6b493bc34ccd77f731307b5039e22d844]]]
Former-commit-id: 5b10ac2f36
Former-commit-id: 0724aa4e71
[formerly 107ccbf332
]
Former-commit-id: fc49d0bd55
2014-09-29 10:49:14 -05:00
Brian.Dyke
23450210b1
Merge branch 'master_14.2.3' into master_14.2.4
...
Former-commit-id: fce029653d
[formerly 0a497fc015
] [formerly fce029653d
[formerly 0a497fc015
] [formerly 46af1d0857
[formerly 01cb1dc674ae1249d97dc10be5c068de0ed2a222]]]
Former-commit-id: 46af1d0857
Former-commit-id: 886c1b7e3d
[formerly 85676ff532
]
Former-commit-id: 4d5f7db303
2014-09-29 11:20:57 -04:00
Mark Peters
da12370e57
Omaha #3629 Move datatype specific code from edex.decodertools to the specific datatype edex plugins
...
Change-Id: I6b66103ef55107df78fdbb047dfb8c743deaf2d4
Former-commit-id: 5fb76a1532
[formerly 549cf2a2b1
] [formerly 5fb76a1532
[formerly 549cf2a2b1
] [formerly 0c657c2a49
[formerly e196f02cf7533498280b252e9c345f9b3c4a3629]]]
Former-commit-id: 0c657c2a49
Former-commit-id: 34d60c7e4a
[formerly 8084133432
]
Former-commit-id: bd117c0ebf
2014-09-26 14:50:03 -05:00
Brian.Dyke
ef96354985
Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
...
Former-commit-id: 858cfa1078
[formerly 41921f7db2
] [formerly 858cfa1078
[formerly 41921f7db2
] [formerly 814b9a2869
[formerly 60756ddb841a0daa347493047b76d2fcb93f7f4a]]]
Former-commit-id: 814b9a2869
Former-commit-id: ee0c04ae93
[formerly a2b18e4bee
]
Former-commit-id: 7f406eb3b6
2014-09-26 15:15:57 -04:00
Brian.Dyke
ccbb922254
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: f520ff97b6
[formerly 8245370186
] [formerly f520ff97b6
[formerly 8245370186
] [formerly a4f68caac6
[formerly 6ed90023551e25216c10d05f2568593992326900]]]
Former-commit-id: a4f68caac6
Former-commit-id: 328edcaebf
[formerly 34a073a848
]
Former-commit-id: 554cb1a84d
2014-09-26 13:02:49 -04:00
Richard Peter
32470b19e5
Merge "Omaha #3622 Fix duplicate SiteActivationNotifications. Check in the rest of the changes I missed the first time." into omaha_14.4.1
...
Former-commit-id: 5b023b628e
[formerly 941305b33d
] [formerly 5b023b628e
[formerly 941305b33d
] [formerly 1656522716
[formerly 3daaa4e6b33bd284a088f290b40b7f63b4c27a43]]]
Former-commit-id: 1656522716
Former-commit-id: 6f8183557e
[formerly 844717fb57
]
Former-commit-id: 9af9fbed55
2014-09-26 11:44:41 -05:00
Ron Anderson
72cb3d29b3
Omaha #3622 Fix duplicate SiteActivationNotifications.
...
Check in the rest of the changes I missed the first time.
Change-Id: I8640f8f09aeb6019374a857daf335b27c69e0880
Former-commit-id: e2d5bfa0b6
[formerly b032f7f24e
] [formerly e2d5bfa0b6
[formerly b032f7f24e
] [formerly 43d3aca5ea
[formerly 67d19df57e57a77a0a1a83e695631a7a9cb22368]]]
Former-commit-id: 43d3aca5ea
Former-commit-id: 9bdae769c6
[formerly bc8a515870
]
Former-commit-id: 42da911091
2014-09-26 11:39:06 -05:00
Richard Peter
f91697cc5b
Merge "Omaha #3622 Fix duplicate SiteActivationNotifications." into omaha_14.4.1
...
Former-commit-id: c9c4dda54c
[formerly a4668b64a6
] [formerly c9c4dda54c
[formerly a4668b64a6
] [formerly 23747ad042
[formerly acbc667cfeab1ab6449a93967896e6e303bb238d]]]
Former-commit-id: 23747ad042
Former-commit-id: fffd7c6f48
[formerly 554f75dc16
]
Former-commit-id: 6f644ed32e
2014-09-26 11:27:53 -05:00
Brian.Dyke
7f65a5b799
Merge branch 'omaha_14.2.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.3
...
Former-commit-id: 0045c3100f
[formerly 586a504500
] [formerly 0045c3100f
[formerly 586a504500
] [formerly bd983e1932
[formerly d6369c8346d1ed4d86ed3eb7adc47de0891c7fd7]]]
Former-commit-id: bd983e1932
Former-commit-id: 30f8b55a19
[formerly 95d80abd56
]
Former-commit-id: 295e2814f7
2014-09-26 11:47:38 -04:00
Ron Anderson
708b4d43fa
Omaha #3622 Fix duplicate SiteActivationNotifications.
...
Change-Id: I647bf118f558721867722cfc13d889e637237911
Former-commit-id: 71aad3ecff
[formerly 92575e8db3
] [formerly 71aad3ecff
[formerly 92575e8db3
] [formerly dd4f22789a
[formerly 8f687189a5c71f3bd04b5e31f6a45606fe456386]]]
Former-commit-id: dd4f22789a
Former-commit-id: c4b97646fc
[formerly 891e864f00
]
Former-commit-id: 3c3547ffcf
2014-09-26 15:19:08 +00:00
Shawn.Hooper
8f6e82acd9
ASM #600 - WarnGen: template optional watch inclusion
...
Change-Id: I282e94236389a907326926a68e2ed810a00b9688
Former-commit-id: 56cd6483ef
[formerly da77322fd0
] [formerly 56cd6483ef
[formerly da77322fd0
] [formerly 831af82c23
[formerly 04bd69f437b897d63ac78d6cbd7c60451366cc6d]]]
Former-commit-id: 831af82c23
Former-commit-id: b7b38c3c7b
[formerly a242e1c43b
]
Former-commit-id: 3d098f947d
2014-09-25 16:25:43 -04:00
Ron Anderson
ad968b9aac
Issue #3648 Fix GridParmManager.d2dGridDataPurged() to use deallocateDb.
...
Change-Id: Id9bb73c54028615c33a61373d7b565a230867c1a
Former-commit-id: df1d9f8b72
[formerly 7020daa55a
] [formerly df1d9f8b72
[formerly 7020daa55a
] [formerly 34df50963e
[formerly 8c177752b8e2baa2e739fc69320c4e4b31d972c7]]]
Former-commit-id: 34df50963e
Former-commit-id: fee7ce9822
[formerly 86bdbd1134
]
Former-commit-id: 6ac8cc0857
2014-09-25 13:48:11 -05:00
Ana Rivera
b7103620e3
VLab Issue #4836 - O&M RM14013; Update aKrtmaNDFD.xml; fixes #4836
...
Change-Id: I18d92482782e4c95cdd147d1edb1f65f3865b98f
Former-commit-id: 043ec96c2d
[formerly 39fc13eb38
] [formerly 043ec96c2d
[formerly 39fc13eb38
] [formerly c1b58f214f
[formerly cf3d9a81a52c19977371e3abee755d1c239b1f8a]]]
Former-commit-id: c1b58f214f
Former-commit-id: b250aa80e8
[formerly e76f4d183e
]
Former-commit-id: d0fdac6975
2014-09-25 18:18:21 +00:00
Kevin.Johnson
38c3fbaae5
ASM #15672 - Added initial field tested version of edexOsgi/com.raytheon.uf.tools.cli/impl/check_baseline_changes.sh
...
Change-Id: Ibbd6bcb2fb36c02418fb612436d7db5ba9f571a7
Former-commit-id: 7d677d0023
[formerly 5a38528711
] [formerly 7d677d0023
[formerly 5a38528711
] [formerly 4d8efeeb9a
[formerly c36b732cc8057cf7b830de647998f679725760da]]]
Former-commit-id: 4d8efeeb9a
Former-commit-id: d719e57462
[formerly 498374fbac
]
Former-commit-id: 44b54df49e
2014-09-25 10:50:07 -04:00
Nate Jensen
3c7d92703e
Merge "Omaha #3220 - Changes in the area configuration files for FSSObs monitors." into omaha_14.4.1
...
Former-commit-id: e74bfdc195
[formerly 364aff9278
] [formerly e74bfdc195
[formerly 364aff9278
] [formerly 174b036c56
[formerly e2f23221c3f8301460df2945deb8c760cdf216e9]]]
Former-commit-id: 174b036c56
Former-commit-id: d1171b2e18
[formerly ad6bd4e7ff
]
Former-commit-id: eb077c4bcf
2014-09-25 08:44:50 -05:00
Baoyu Yin
9555c33950
VLab Issue #4553 - AWIPS2_DR_16047: An update for Bad rule in gridImageryStyleRules.xml for Convective Inhibition; fixes #4553
...
Change-Id: Ib4e566154c6b8282efb33464b850ff1f66a5e6d0
Former-commit-id: e9e3ad94ab
[formerly dea223412e
] [formerly e9e3ad94ab
[formerly dea223412e
] [formerly c9385c0912
[formerly 847ecb836cf5d7bad28817dd68e752e4ba79f6c4]]]
Former-commit-id: c9385c0912
Former-commit-id: 7156ed4199
[formerly ed0b9c0ce1
]
Former-commit-id: 77e0e5fe6a
2014-09-25 09:44:21 -04:00
Slav Korolev
27f8c438d2
Omaha #3220 - Changes in the area configuration files for FSSObs monitors.
...
Former-commit-id: 1120f9a440
[formerly 7b1a4c6774
] [formerly 1120f9a440
[formerly 7b1a4c6774
] [formerly ce2ef5019b
[formerly d7a921d6206f5b09e7a6784c7e86b9167b74685f]]]
Former-commit-id: ce2ef5019b
Former-commit-id: 7e739e4197
[formerly 11ee774939
]
Former-commit-id: 3033eba2f3
2014-09-25 09:02:27 -04:00
Nate Jensen
8096bd8fdc
Omaha #3663 move airep and pirep plguins to ncep features
...
Change-Id: I2c9a274ee85b24e93800fa7c0f73739030995219
Former-commit-id: 86b76b399d
[formerly 4cf93c0acb
] [formerly 86b76b399d
[formerly 4cf93c0acb
] [formerly 36556fc48b
[formerly 8f743862722b2af08e6659ca3beb0366095bcf79]]]
Former-commit-id: 36556fc48b
Former-commit-id: f2432e5a47
[formerly 98d47a8dd2
]
Former-commit-id: 6bfa9cd589
2014-09-24 15:20:17 -05:00
Ana Rivera
f4714fb5d4
VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669
...
Change-Id: I54c1055b87b7bfab0a35fd391c6ef7156fc3d297
Former-commit-id: bb533d9ddd
[formerly 535f254357
] [formerly bb533d9ddd
[formerly 535f254357
] [formerly 9a0e9b17f4
[formerly 2c16492202230dcbec93cf390b47f400a77a545e]]]
Former-commit-id: 9a0e9b17f4
Former-commit-id: 70b0854582
[formerly ed7119ed4e
]
Former-commit-id: 42a6d22008
2014-09-24 20:11:29 +00:00
Benjamin Phillippe
817a414fb0
Issue #3560 Fixed slow memory leak in registry
...
Former-commit-id: c7d6c602bd
[formerly fb8dc9fe7d
] [formerly c7d6c602bd
[formerly fb8dc9fe7d
] [formerly 81870960e6
[formerly 918119b26864ee246ac2571baa4e380ae21f2ded]]]
Former-commit-id: 81870960e6
Former-commit-id: 13d75b618a
[formerly ccd798d7f7
]
Former-commit-id: c0a0878fb5
2014-09-24 14:36:34 -05:00
Brian.Dyke
c22973f909
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml
Former-commit-id: b49b13f77e
[formerly 4b418918d4
] [formerly b49b13f77e
[formerly 4b418918d4
] [formerly 87fa32d2d4
[formerly e04ad21771ce410beb25e15fe300a34796a1a062]]]
Former-commit-id: 87fa32d2d4
Former-commit-id: cf8f88a5b3
[formerly 1f09dad9e9
]
Former-commit-id: 8997f79ae4
2014-09-24 11:05:37 -04:00
Slav Korolev
a0a543439f
Issue #2757 - Fixed problem with adding and removing zones.
...
Former-commit-id: 4c209b4958
[formerly 443c7c7482
] [formerly 4c209b4958
[formerly 443c7c7482
] [formerly a4914bd85d
[formerly 31ccaf218df628327fe4b27d69a4500eb1dc8d84]]]
Former-commit-id: a4914bd85d
Former-commit-id: 1596ad20b6
[formerly d08b42a7de
]
Former-commit-id: 512ca34484
2014-09-24 09:34:43 -04:00
Steve Harris
9a7885684e
Merge branch 'omaha_14.4.1' into omaha_pda
...
Former-commit-id: c1f8f3da76
[formerly 374a8cf99b
] [formerly c1f8f3da76
[formerly 374a8cf99b
] [formerly f1d1d9fc15
[formerly 03a52fa50e7e51eccf7ccc8d80c851c3ab221fdb]]]
Former-commit-id: f1d1d9fc15
Former-commit-id: 26c1ccd3c9
[formerly 0a52cb98be
]
Former-commit-id: 6f2ed963a3
2014-09-23 21:43:25 -05:00
Ron Anderson
dcf6d96c18
Issue #3648 Improve GFE error handling for getAllAvailableParms.
...
Change-Id: I13d41a3c231a56fe7d6fc4bc3cbfd96e1bdcdccf
Former-commit-id: 8d0d43a437
[formerly 429de3224f
] [formerly 8d0d43a437
[formerly 429de3224f
] [formerly c37618c16c
[formerly b77b3c916b4dcc9034408220006f941cd301ed3c]]]
Former-commit-id: c37618c16c
Former-commit-id: 99f47f37fd
[formerly 0ad9b46bce
]
Former-commit-id: a3ae3bcb74
2014-09-23 18:47:38 -05:00
Ron Anderson
7efcbed553
Issue #3648 Change GFE version purging to be event driven.
...
Change-Id: I204a37535464d6d04dddd0614716dfe8f51ef40e
Former-commit-id: b0bb1aba4b
[formerly 25a41ff9db
] [formerly b0bb1aba4b
[formerly 25a41ff9db
] [formerly 580db71dc8
[formerly ad725686f80a1f67ca6865859ad4f072edd1c54f]]]
Former-commit-id: 580db71dc8
Former-commit-id: 69c3e4d3dd
[formerly 3bfe4607c1
]
Former-commit-id: e99d600d37
2014-09-23 13:43:14 -05:00
David Friedman
7ee76a9b2a
ASM #15658 - WarnGen: inclusion of watch information in marine products
...
Change-Id: I545d1b07444c9ca00ea2e95c4ccaed79946bbead
Former-commit-id: 0ed1ce5726
[formerly a6acf71a0a
] [formerly 0ed1ce5726
[formerly a6acf71a0a
] [formerly 2ee1ebe72d
[formerly e0f6cc70bf5258d66bfa8a4ddb1daf871b6c92c5]]]
Former-commit-id: 2ee1ebe72d
Former-commit-id: c720756850
[formerly 4b3f5bc5c7
]
Former-commit-id: 3ee52065d1
2014-09-23 18:39:22 +00:00
Nate Jensen
79609628d0
Merge "Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools" into omaha_14.4.1
...
Former-commit-id: 5582df03b9
[formerly c9033dc300
] [formerly 5582df03b9
[formerly c9033dc300
] [formerly 3ae54c26c6
[formerly 21ad2f0d0229235495edc9319e8493d8a6b4d6b4]]]
Former-commit-id: 3ae54c26c6
Former-commit-id: 2fe7f33be9
[formerly 64edefbf51
]
Former-commit-id: 0a72a384a8
2014-09-23 12:15:56 -05:00
Mark Peters
71fdd40be2
Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools
...
Change-Id: I65fee949e595b76be5c998dcd550b287928a1d65
Former-commit-id: 27f5ae502d
[formerly bd5996a599
] [formerly 27f5ae502d
[formerly bd5996a599
] [formerly 9176913542
[formerly 1350720111ceeb83893c5c0129eb41d662d16211]]]
Former-commit-id: 9176913542
Former-commit-id: 6ce445d20b
[formerly c9e8228954
]
Former-commit-id: 757ecb423c
2014-09-23 12:12:22 -05:00
Steve Harris
d3169a96b0
Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java
Former-commit-id: 2e2072a963
[formerly 7692e3f21d
] [formerly 2e2072a963
[formerly 7692e3f21d
] [formerly b979960b7b
[formerly 72f387d2802c12eedfe5643616fe5a54420aef66]]]
Former-commit-id: b979960b7b
Former-commit-id: e5f8a8f74f
[formerly 50d6dccd09
]
Former-commit-id: f831536854
2014-09-23 11:41:10 -05:00
Nate Jensen
bdf1411f78
Merge "Omaha #3356 fix apps_dir setting detection in viz/cave" into omaha_14.4.1
...
Former-commit-id: 3e82c0f768
[formerly 39f330b583
] [formerly 3e82c0f768
[formerly 39f330b583
] [formerly 29ee81f50c
[formerly 39c26499805dc23b232397a2f9349ed17564ae13]]]
Former-commit-id: 29ee81f50c
Former-commit-id: 991276ab34
[formerly 45e8f476ed
]
Former-commit-id: 30f1398f14
2014-09-23 09:52:22 -05:00