Steve Harris
9132d9004e
Merge branch 'master_14.2.1' (14.2.1-17,18) into omaha_14.2.1
...
Former-commit-id: 5bf5bdb6b0eb2f2865fe
2014-04-15 09:39:33 -05:00
Benjamin Phillippe
490413551b
Issue #3011 Fixed replication slowdown
...
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109
Former-commit-id: 62062bf2883db751fc5b
2014-04-15 09:15:12 -05:00
Brian.Dyke
73be1016c0
Merge branch 'master_14.1.2_to_master_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: 9cce8eb0d18c2f601b59
2014-04-10 13:26:42 -04:00
Richard Peter
5676090443
Merge branch 'master_14.1.2' into master_14.2.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: b15d28853095eba8dcf6
2014-04-09 16:00:54 -05:00
Brian.Dyke
e4136f79dd
Merged 1354 -7 and -8 into 1412
...
Former-commit-id: 929b736038947194c998
2014-04-09 11:39:07 -04:00
Ben Steffensmeier
5b3a8dccbf
Issue #2973 Use correct area for expanding subgrid requests.
...
Former-commit-id: 000f259cf490f1750691
2014-04-04 13:17:36 -05:00
Brian.Dyke
17477e7db1
Merged 1354 -5 and -6 into 1412 based on 1411-25
...
Former-commit-id: dd98c213c76a28fcb156
2014-04-04 12:57:32 -04:00
Steve Harris
4b96900460
Merge branch 'master_14.2.1' (14.2.1-16) into omaha_14.2.1
...
Former-commit-id: cb2d69e338acd5392e9a
2014-04-03 13:00:11 -05:00
Ron Anderson
346984b8ab
Issue #2969 Fixed error when Topo parm is unloaded.
...
Fixed check state of Topography menu item.
Change-Id: I3cd13d91b489425e05efd68fd6bbbfd9a9d3cd4b
Former-commit-id: d55605529911fbd86558
2014-04-02 09:07:22 -05:00
Greg Armendariz
50fb1ec68a
Merge "Issue #2949 Updated scripts Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80" into omaha_14.2.1
...
Former-commit-id: 0d0d7bd5136b339bcb86
2014-04-01 19:33:30 -05:00
Richard Peter
bfba75f73f
Issue #2509 : Fix stitched grid notifications
...
Change-Id: Ib4581f8c8d3f3eae15d22601cfc35732acd849a4
Former-commit-id: f99875040c53d5000261
2014-04-01 14:44:05 -05:00
Dave Hladky
41e43a169b
Issue #2949 Updated scripts
...
Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80
Former-commit-id: ede510dd913d6ebf498e
2014-04-01 12:33:48 -05:00
David Gillingham
402adfeddb
Issue #2418 : Re-implement GFE support for pSurge 2.0 data to match A1.
...
Change-Id: I984a4c3e62a1fd5a18610146fa1dd35b9050a8f9
Former-commit-id: 70b28b4e1ea529bc8cad
2014-03-31 15:49:33 -05:00
Brian.Dyke
a1b980a15d
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
...
Former-commit-id: 3b639347f86346c9776b
2014-03-27 10:22:26 -04:00
Steve Harris
9cf3600ff6
Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1
...
Former-commit-id: a7efde7cf44879520391
2014-03-26 15:51:32 -05:00
Brian.Dyke
027cca8673
Fixed comment merge conflicts added .gitignore
...
Former-commit-id: a0e7cb624a7cc471a9c9
2014-03-25 15:41:58 -04:00
Brian.Dyke
c085bc6879
OB_14.1.1-25 baseline
...
Former-commit-id: 074abeb0fac67833407c
2014-03-25 13:55:54 -04:00
Richard Peter
6236137635
Merge "Issue #2939 Madis data mismatches Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2" into omaha_14.2.1
...
Former-commit-id: 897980da08390e73af44
2014-03-24 09:53:13 -05:00
Dave Hladky
39343e1801
Issue #2939 Madis data mismatches
...
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2
Former-commit-id: 9f3c5dcc423ac04dd071
2014-03-24 08:27:12 -05:00
Mike Duff
ff07b90659
Issue #2941 - Sort data before returning
...
Former-commit-id: 4db73e42a573a011b940
2014-03-24 08:19:21 -05:00
Brian.Dyke
50e5f4f78d
Merge branch 'master_14.1.1' into master_14.2.1
...
Former-commit-id: 07b2e04d7a06ee9a6384
2014-03-24 07:01:29 -04:00
Brian.Dyke
37e9d48d45
OB_14.1.1-24 baseline
...
Former-commit-id: face1ebeeb37b6368268
2014-03-21 12:43:50 -04:00
Ben Steffensmeier
14907292da
Issue #2932 improve compatibility of pop skewT and blended resources.
...
Former-commit-id: effb0bfcd8933b172ca0
2014-03-20 13:18:40 -05:00
Nate Jensen
6edec10edc
Issue #2919 fix windows error due to gempak library missing
...
Former-commit-id: 82ee3e7104747ac58166
2014-03-20 09:38:07 -05:00
Brian.Dyke
9f332e938c
Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 9c412e444ed23acbdd48
2014-03-14 11:13:30 -04:00
Brian.Dyke
24a63fb05a
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: 30084d7f84030a18f804
2014-03-14 10:15:53 -04:00
Brian.Dyke
4e3096631d
Merge branch 'omaha_14.2.1' of cm2:/home/garmenda/deliveries/14.2.1/AWIPS2_baseline.14.2.1 into master_14.2.1
...
Former-commit-id: f999e48df0d4b6d22ae2
2014-03-14 08:44:39 -04:00
Brian.Dyke
55918ee421
OB_14.1.1-23 baseline
...
Former-commit-id: bc6a7bf946dcc2e4fd61
2014-03-14 08:18:16 -04:00
Kevin P. Johnson
e3a951da78
ASM #245 logs in caveData need to be purged. Added function to caveUtil, added BASE_LOGDIR in cave.sh and added function call
...
Change-Id: I41e5e11254fc52e49c4668b2797624c599130c67
Former-commit-id: 4c833d3389b2797a0788
2014-03-13 20:42:12 +00:00
Ben Steffensmeier
e6cd8b3167
Issue #2528 Fix satellite units/style.
...
Former-commit-id: 75120a09cd77041e5b17
2014-03-12 14:19:49 -05:00
Richard Peter
e981ce3e36
Merge "Issue #2678 end retrieval double clutching Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc" into omaha_14.2.1
...
Former-commit-id: f59d1433db18234c5d73
2014-03-11 16:43:37 -05:00
Dave Hladky
7cd4304140
Issue #2678 end retrieval double clutching
...
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc
Former-commit-id: 76e216d3193500ad262a
2014-03-11 15:53:59 -05:00
Nate Jensen
cef0438c35
Merge "Issue #2896 Fix sat best res on weird projections" into omaha_14.2.1
...
Former-commit-id: afbdf6962c85f5821a6f
2014-03-11 12:35:44 -05:00
David Gillingham
e3a3cf7bad
Issue #2509 : Fix static topo generation break caused by baseline merge.
...
Change-Id: I4300af81de44639a6ac55b968f18730f698e3b68
Former-commit-id: 187196b519b0783b64ce
2014-03-11 11:54:25 -05:00
Ben Steffensmeier
c7fa392f3f
Issue #2896 Fix sat best res on weird projections
...
Former-commit-id: 560fc688bc8bb517836a
2014-03-11 11:07:43 -05:00
Nate Jensen
17aa39ce0a
Issue #2779 update memory settings for renamed NC perspective
...
Former-commit-id: 5eb892f4cfccb06db199
2014-03-11 10:28:01 -05:00
Brian.Dyke
fa16721854
Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: fcc9115b0d552490206f
2014-03-11 10:44:03 -04:00
Juliya Dynina
b3ec4c363f
Merge "ASM #349 - Workaround for QPID-5569" into asm_14.2.1
...
Former-commit-id: 79528624436bbd88e62c
2014-03-11 09:24:12 -05:00
Brian.Dyke
bcf9a5dc83
Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: 4269f9d875c6f2010ce6
2014-03-10 15:42:38 -04:00
brian.dyke
1a482f91bc
Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1
...
Former-commit-id: b1b216f196654778bb0d
2014-03-10 15:36:56 -04:00
Brian.Dyke
24785068be
Merge branch 'ncep_14.2.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.1
...
Former-commit-id: fda6ab1344d710aec521
2014-03-10 15:14:59 -04:00
Nate Jensen
5a88f31a2b
Issue #2779 add .ini generation of memory settings for other components
...
Former-commit-id: d599db4af26a75fe686a
2014-03-10 10:03:02 -05:00
Stephen Gilbert
200c7e60da
VLab Issue #3224 - NSHARP: Fix erroneous mixing heights
...
Change-Id: Ib27352c1f0e5f2ee860577e5b3e96be5252902f2
Former-commit-id: f203a4c03565dd8b4c3c
2014-03-07 19:10:08 -05:00
Stephen Gilbert
5fcb45a629
VLab Issue #3223 - NSHARP: Improve selection operation
...
Change-Id: I4d0e92d1db24b3136f60fa224c908dfc020afa1d
Former-commit-id: e3aedaa1d69a457213bb
2014-03-07 19:07:28 -05:00
Stephen Gilbert
a7fd09a409
VLab Issue #3222 - Fix for Plotmodel CAVE hangs in NCP
...
Change-Id: I825c3b0af5177258f531b625f2cc66761e932d57
Former-commit-id: 49a6d6ec7e1632166902
2014-03-07 18:49:21 -05:00
Stephen Gilbert
cce06bfbe3
VLab Issue #3221 - Fix XML serialization problems
...
A few problems reading/writing XML files were noticed after upgrading to
14.2.1. This commit fixes the saving of SPFs, reading of image style
rules, and the location of lockedColorMap file.
Change-Id: I8aad4197029c70f72612299a25329687892884af
Former-commit-id: 6dd6ae8d36625fcb0064
2014-03-07 18:36:42 -05:00
Steve Harris
068297b90a
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 40b543f9a892232fa063
2014-03-07 15:16:18 -06:00
Shawn.Hooper
e894b1279a
ASM #224 - WarnGen: OB13.5.2 Template Errors
...
Change-Id: I68e8942e90fb62388b2c400f6a54f3de1a3f1c28
Former-commit-id: 56a949fba841a4905f9f
2014-03-07 14:53:54 -05:00
Shawn.Hooper
6a8a1c397b
ASM #377 - Baseline National River Location Database fails
...
Change-Id: Idbad0e02ca895b7e649c9d3e7165673fbd1cbaae
Former-commit-id: 85db05e819670da1895b
2014-03-07 13:12:11 -05:00
Shawn.Hooper
b46b87cb5e
ASM #378 - MPE gages are not listed/available in gage table
...
Change-Id: I1a061e6cf8a6364e4401ea4524e3fc0c8cad9b6a
Former-commit-id: dc3aadd1498c9f9b3ae0
2014-03-07 12:57:36 -05:00
