Brian.Dyke
125760432b
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 0f6b0f3d9d
[formerly 0813f96fbb673fdbbdb2c0f049ec722a80b212f9]
Former-commit-id: a155bbd8c1
2014-09-17 15:45:27 -04:00
Ana Rivera
ae6d0f5d64
Merge "VLab Issue #4723 - Ingest LambertConformal projection with two standard parallels using RegionalSat; fixes #4723 " into field_14.3.1
...
Former-commit-id: 536140f021
[formerly c7c530f99f8585817544db2d7be5b13d47c3e62e]
Former-commit-id: 2e66ced748
2014-09-16 08:05:51 -04:00
Steve Harris
eb0a05ab81
Merge branch 'master_14.3.1' (14.3.1-17) into omaha_14.3.1
...
Former-commit-id: 57f0a992d9
[formerly 74d4b836dd8b2eb9a70cf772127d9b7eee23c1bf]
Former-commit-id: d5c0049ba2
2014-09-15 21:13:56 -05:00
Jordan Gerth
898b371293
VLab Issue #4487 - Dim. DR 17313, Additional true color capabilities; fixes #4487
...
Change-Id: I701f302aa5958e89522208fd7915f5077cf97616
Former-commit-id: 8f5903920c
[formerly 1300009502bafd34fee13c8d21d65208b1069bda]
Former-commit-id: 86b34a2f70
2014-09-15 19:14:13 -05:00
Jordan Gerth
478c9db8d3
VLab Issue #4723 - Ingest LambertConformal projection with two standard parallels using RegionalSat; fixes #4723
...
Change-Id: I20b309f4e994259a54e6bdb2276bc09a6b60a885
Former-commit-id: 0b425f94eb
[formerly baf75c177b595dcfb545436586c31d28080b8281]
Former-commit-id: d6eb692733
2014-09-15 16:30:22 -05:00
Ron Anderson
57a3542038
Issue #3592 Fixed several localization issue in GFE
...
Change-Id: I2e65649d490372b5c1738f07c79b5ed15885f8c7
Former-commit-id: b91141ef7b
[formerly a5ef55df33009948fec139e7729dd53ae4251667]
Former-commit-id: 52e5636261
2014-09-09 16:10:53 -05:00
Brian.Dyke
fe85eb9f70
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
Former-commit-id: 01dfe503f5
[formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]
Former-commit-id: 3d9a3de6e4
2014-09-09 11:44:30 -04:00
Brian.Dyke
5415a4939a
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
Former-commit-id: af477df90e
[formerly 7b49ea6d9c45c0624017bbe7ffb1297a402ee875]
Former-commit-id: 858b91d677
2014-09-08 14:54:16 -04:00
Brian.Dyke
4220590613
Merge branch 'master_14.2.3' into master_14.2.4
...
Former-commit-id: 702dd65aa7
[formerly 876c6fc4db3901fdcd8dd9a6fb343d2f65254569]
Former-commit-id: 9e1ee22146
2014-09-05 11:13:12 -04:00
Brian.Dyke
cdd1e08ee3
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
...
Former-commit-id: 9f7fabb002
[formerly c1f870d9df7579741e5a1d79cdec77293115e968]
Former-commit-id: d7407481ef
2014-09-05 10:57:14 -04:00
Ana Rivera
c77e5412a6
VLab Issue #4601 - Update to SMS DR #16720 ; Remove HRRR entries in master_grib2_lookup.txt; fixes #4601
...
Change-Id: I0dfe0991503e6d87ce2db9713bb016d68cd1c152
Former-commit-id: a8b04b8e63
[formerly 084970f8445dbb6b76bbad84b5dc986d961d2383]
Former-commit-id: 6d48576930
2014-09-05 13:27:29 +00:00
Brian.Dyke
fa6b302ab6
Merge branch 'master_14.2.2' into master_14.2.3
...
Former-commit-id: d695dd0084
[formerly 3385f2bc24dfb42e82f9e3451cd44da8dfb89e9a]
Former-commit-id: 043a95d35e
2014-09-03 21:14:27 -04:00
Brian.Dyke
3ddb5831a0
ASM #15697 - Fix Hydro Perspective Issue
...
Former-commit-id: cfe03adff6
[formerly 82d7bbe6bf005e543e1ad6772c6a18024f1b0764]
Former-commit-id: 121a2d100f
2014-09-03 21:10:16 -04:00
Steve Harris
0ea6b72088
Merge branch 'master_14.2.4' (14.2.4-7) into omaha_14.2.4
...
Former-commit-id: afa45bf919
[formerly 2391bc928e8798f022c3ca5ad8a1d5619ae4e2a4]
Former-commit-id: 0e869fa6c1
2014-09-03 15:22:00 -05:00
Richard Peter
1c05f1b459
Merge "Issue #3560 Registry objects not re-sent after fully sync" into omaha_14.2.4
...
Former-commit-id: af87813ea9
[formerly 5f9298d52d0a11775588ed3742f2c2d3f19da1d0]
Former-commit-id: 3de26efce6
2014-09-03 09:42:34 -05:00
Nate Jensen
a690b853bb
Merge "Issue #3572 Fixed getNumpy errors for Grid2DFloat" into omaha_14.2.4
...
Former-commit-id: c23071f48c
[formerly 9e0f31fc6601a39938deeaf7e1c8ed8849e43288]
Former-commit-id: 0f35426ad0
2014-09-02 17:34:59 -05:00
Brian.Dyke
9e156775e5
Merge branch 'master_14.2.3' into master_14.2.4 CM-MERGE:14.2.3-1 (14.2.2-30,-31) into 14.2.4
...
Former-commit-id: 14e64881a1
[formerly bc9f03426304e3bb194fbf7f356d8dd3816cd836]
Former-commit-id: fd8ad016ef
2014-09-02 16:32:54 -04:00
Brian.Dyke
e425e5bf8c
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
...
Former-commit-id: 611e036e75
[formerly 40efe51cafd5589ef0a640041ad0539e454b6f8d]
Former-commit-id: f0875e724f
2014-09-02 16:30:51 -04:00
Benjamin Phillippe
30f3289917
Issue #3560 Registry objects not re-sent after fully sync
...
Change-Id: Id38989cf953aacb985d627422c043f8768df2ed0
Former-commit-id: 955ac3a670
[formerly 15e57fc58bee1045c5574e4d66a727a672ac83cb]
Former-commit-id: 7265bf54c7
2014-09-02 14:46:50 -05:00
Qinglu.Lin
b32ea40289
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
...
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05
Former-commit-id: ae13ea419e
[formerly 59890eef397f3282ef26f259ca85ffea3db7b710]
Former-commit-id: 2374673f8d
2014-09-02 14:37:19 -04:00
Ron Anderson
c7fbca0298
Issue #3572 Fixed getNumpy errors for Grid2DFloat
...
Change-Id: I6caf979c1d531a842f77d23dbd7f8e0865afecce
Former-commit-id: 434d412882
[formerly e2ecb91569c2f622d45f7301c1eb4e058a2ab641]
Former-commit-id: 46c62a1db6
2014-09-02 12:21:42 -05:00
Richard Peter
abc807850f
Merge "Issue #3560 Fix for registry memory issue" into omaha_14.2.4
...
Former-commit-id: 0e29b2d17f
[formerly 6789576e88de568c6014c29d099349cec40c7c74]
Former-commit-id: be2474da34
2014-09-02 12:15:38 -05:00
Benjamin Phillippe
12914fb1e5
Issue #3560 Fix for registry memory issue
...
Former-commit-id: 2da57d3bc2
[formerly a6e4a2cac4d6f9390c5181439a6c834db56a95c6]
Former-commit-id: ab8b2ef473
2014-09-02 10:00:35 -05:00
Dave Hladky
534b784843
Issue #3564 Allow for un-authenicated WFS HTTPS connections.
...
Change-Id: Ib144a570b2206b336aac0b9e8ebc00c9f096775a
Former-commit-id: 82fd7189b9
[formerly 7afe5332fcf41bbc8bb2411944584405f3ba686a]
Former-commit-id: 9c3b002990
2014-09-02 09:38:21 -05:00
Steve Harris
f7e39c9d6f
Merge branch 'master_14.2.4' (14.2.4-6) into omaha_14.2.4
...
Former-commit-id: e7705c328e
[formerly 09b94266f1f3aeaaa7fcf622487d751097d271a4]
Former-commit-id: 3b6a003884
2014-09-02 08:12:49 -05:00
Ana Rivera
e033ed5546
VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617
...
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1
Former-commit-id: 9af77831a6
[formerly 2df117a7aec644e6964da6c36326ab3b29b9f378]
Former-commit-id: 160dabc4d1
2014-08-28 18:38:26 +00:00
David Friedman
ea1e9feb1d
ASM #15658 - WarnGen: inclusion of watch information in marine products
...
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9
Former-commit-id: ea9230b37c
[formerly 6bfa1d6662b00925814be7126592bbe340651649]
Former-commit-id: a2dfe8e8f6
2014-08-28 15:43:32 +00:00
Brian.Dyke
76bd6575b6
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
...
Former-commit-id: a24794ca7b
[formerly 3909fa46a4efffabb09303f139bc36accc064a6d]
Former-commit-id: 47ae6015e5
2014-08-28 11:39:48 -04:00
Brian.Dyke
a08db8d73d
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: aa83bf804f
[formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]
Former-commit-id: e654318431
2014-08-27 11:19:19 -04:00
Brian.Dyke
489fec4b25
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: b3767167c7
[formerly 2382e17fb6b947be89649da7c25698dc5baf5bf4]
Former-commit-id: 86f0ed23c1
2014-08-26 13:31:34 -04:00
Roger Ferrel
1ff321ce51
Issue #3537 Fixed dirPattern in category Local.
...
Former-commit-id: e451dd2814
[formerly d40736ed992300be32ed4a62511fa436e9d167af]
Former-commit-id: c7a6040792
2014-08-25 13:23:44 -05:00
Nate Jensen
0852d804ba
Merge "Issue #3500 remove locking on osgi internals, rework gfe client startup" into omaha_14.2.4
...
Former-commit-id: d66ac29640
[formerly bb08cb510dc3d774e040b7d3a164dfa1d581aa1c]
Former-commit-id: 5e46c55a76
2014-08-25 13:12:46 -05:00
Brian.Dyke
2ddc920a4a
Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
Former-commit-id: dd9d7133d9
[formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]
Former-commit-id: 325887e605
2014-08-22 14:16:22 -04:00
Brian.Dyke
5b2b0d2bd9
Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
...
Former-commit-id: 94577a1626
[formerly b2674ef57183706feb2bb17175d730bb2e213281]
Former-commit-id: a830b6d94c
2014-08-22 14:13:48 -04:00
Richard Peter
4cebb22560
Issue #3534 Update ThreadBasedAppender to extend UnsychronizedAppenderBase.
...
Change-Id: I6b01acd59f7fde5e98dcfe1f1221f8725fc0540b
Former-commit-id: a9af2314d3
[formerly 31e9cb1cfc15d79b204d4d16c1f7afa614bb9ca2]
Former-commit-id: ce238544d1
2014-08-22 10:47:05 -05:00
Brian Clements
bcc3e405e5
Issue #3500 remove locking on osgi internals, rework gfe client startup
...
fixed error handling in loadConfig.py
added python to path in GfePyIncludeUtil
moved ProcedureXMLManager to overridable method in AbstractCaveComponent
Change-Id: Ie7dff55657ba216c47f7a56b3506cbed3a3f6ab2
Former-commit-id: 9f7905b58d
[formerly b0ea9a2a04cf043fe1a9e4dbf4d4498b0d3f4684]
Former-commit-id: d62db22874
2014-08-22 08:56:56 -05:00
Brian.Dyke
f6748f1e28
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
...
Former-commit-id: aaabfa6cd0
[formerly 614b2bb59424f01d2608cd2db3a14dbcd77c90e6]
Former-commit-id: 14d21b336d
2014-08-21 12:07:16 -04:00
Brian.Dyke
93be1a54c7
VLab Issue #3648 - Corrected NCEP additions for ESTOFS model -fix gribModels_NCEP-7.xml tag
...
Former-commit-id: ae5656ca46
[formerly 1b83b788aee082b489ce0fe5dc6d775e2f621e01]
Former-commit-id: 7b8fef0fa3
2014-08-21 11:07:02 -04:00
Ron Anderson
a19f819e44
Issue #3526 Fix bug in WECache that caused ISC grids to be removed
...
Change-Id: I49feb0d093a75c83b9a09deeed15e81cf0ed967b
Former-commit-id: 8c4cb3b4ae
[formerly edd1c5d77ec7a84b5807134d863d59147a846405]
Former-commit-id: 62236ee92a
2014-08-20 11:03:03 -05:00
Zihou Wang
3fa6a7840e
VLab Issue #3990 - DR_17356 Enhancement to Radar Display of SAILS 0.5 degree products; fixes #3990
...
Change-Id: Ib6be85a3fb40649a093c8cd5d9278f324edb3a7f
Former-commit-id: 45d8572343
[formerly 3d305bffddf34d38b65176280e40709549f09ee5]
Former-commit-id: 9b68bea7c3
2014-08-20 14:20:17 +00:00
Roger Ferrel
d76722987e
Issue #3439 Name change per suggestions in email.
...
Former-commit-id: f110ca1f3d
[formerly 44c3b86c9dc0b978acc66c5f79255270ce0acb41]
Former-commit-id: fb54b80ed5
2014-08-19 16:41:06 -05:00
Slav Korolev
1c896cedab
Issue #2875 - Implemented HFR Surface Current Velocity.
...
Change-Id: I586e6aa4064df538b0dcb7012f7c26ce529e4761
This reverts commit 55a1120bdb
[formerly dd9d117f90
] [formerly e5af41fa86
[formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f]].
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
Former-commit-id: a779c786f1
[formerly aee044437492438381db98cc6fd3a917f6c05659]
Former-commit-id: a9bed4c6fd
2014-08-19 10:12:36 -05:00
Brian.Dyke
2054d6f844
Merge branch 'master_14.2.2' into asm_14.2.2
...
Former-commit-id: d82d58d38e
[formerly 5c9880c3179bf376798bb5658aec3666bddd7d3e]
Former-commit-id: 9a212410b5
2014-08-18 11:47:38 -04:00
Melissa Porricel
9f20c63f97
ASM #15699 - Fix Grib decoder error
...
Change-Id: Ieabe763de544960f6e7bae0e2cf940eaa2493511
Former-commit-id: 7e78946ee0
[formerly e8c156d166cedc1553f9ffd8867633651443872d]
Former-commit-id: 67e44f145a
2014-08-15 13:41:53 -04:00
Zihou Wang
2fd6278cf3
VLab Issue #3990 - DR_17356 Enhancement to Radar Display of SAILS 0.5 degree products; closes #3990
...
Change-Id: I2af5cb375294163d9c20ac7342ef72ebaa6c51ce
Former-commit-id: f54da5f6ae
[formerly f61e935c0372ee19768f2080da1f8fa21fb9aeb1]
Former-commit-id: e9f78d8f52
2014-08-15 11:04:39 -05:00
Ana Rivera
11073fdece
VLab Issue #3943 , #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
...
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e
Conflicts:
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 4c585af933
[formerly 7fa5b7a34613e88a77e4b32c79c6d8c3c6166ba2]
Former-commit-id: 9ada9356c5
2014-08-15 11:04:23 -05:00
Stephen Gilbert
84c3e1ed26
VLab Issue #3648 - Corrected NCEP additions for ESTOFS model
...
Change-Id: I0824e9ebabb4cd0884f202899321f2a05198627b
Conflicts:
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
Former-commit-id: 77fa357a15
[formerly aef15e75c53666aa65dd4687725e9dbd8e6122e0]
Former-commit-id: f6225b8969
2014-08-15 11:03:48 -05:00
Fay.Liang
c2dd7c183f
ASM #600 - the fixes for DR 17380
...
Change-Id: Iacd1c3dde4f43086dc1ba60ae47e1b0066a0187a
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
Former-commit-id: 77a6ab632f
[formerly 89c29c1228830d301b7046ebb7d4281666c2b768]
Former-commit-id: f5901b8ede
2014-08-15 11:03:15 -05:00
Ana Rivera
1daa44291e
VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
...
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 9bf2df23be
[formerly b7815d59250a73ee587d57bd2ece84691fe8707c]
Former-commit-id: a44d5d91db
2014-08-15 11:02:36 -05:00
David Friedman
5604904fc8
ASM #551 - EDEX can decode some METAR peak wind fields as 6 hour min/max temperature
...
Change-Id: I1bf62b197f65073dc26356e9eb67d32f7f8ee45c
Former-commit-id: 62f152ad70
[formerly b3947c58da51f964032e9539c010030c2cbe0731]
Former-commit-id: 913330902d
2014-08-15 11:01:42 -05:00