Richard Peter
53d5000261
Issue #2509 : Fix stitched grid notifications
...
Change-Id: Ib4581f8c8d3f3eae15d22601cfc35732acd849a4
Former-commit-id: 861f0c09baa01e191b430bce6699c0f1c95a52d2
2014-04-01 14:44:05 -05:00
David Gillingham
a529bc8cad
Issue #2418 : Re-implement GFE support for pSurge 2.0 data to match A1.
...
Change-Id: I984a4c3e62a1fd5a18610146fa1dd35b9050a8f9
Former-commit-id: e820f7ea4046e42ae1112fe8b1a0f8455dbc997d
2014-03-31 15:49:33 -05:00
Steve Harris
4879520391
Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1
...
Former-commit-id: 42a1ec47aa72a882d0f53f94eba3284dccd89b21
2014-03-26 15:51:32 -05:00
Brian.Dyke
7cc471a9c9
Fixed comment merge conflicts added .gitignore
...
Former-commit-id: 6093428342170b9fd8deb741a5721375e80bc955
2014-03-25 15:41:58 -04:00
Brian.Dyke
c67833407c
OB_14.1.1-25 baseline
...
Former-commit-id: dd2417b58b33005985f80cc83b45134132b3e5a1
2014-03-25 13:55:54 -04:00
Richard Peter
390e73af44
Merge "Issue #2939 Madis data mismatches Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2" into omaha_14.2.1
...
Former-commit-id: 5fee1c62ae87e59007b57ba74268b5f272648127
2014-03-24 09:53:13 -05:00
Dave Hladky
3ac04dd071
Issue #2939 Madis data mismatches
...
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2
Former-commit-id: 4105db3604440c6c01b99a11fdc0573e6934376c
2014-03-24 08:27:12 -05:00
Mike Duff
73a011b940
Issue #2941 - Sort data before returning
...
Former-commit-id: 6c9ebb120761257af5e8d6ec08fa9634e5e55185
2014-03-24 08:19:21 -05:00
Brian.Dyke
06ee9a6384
Merge branch 'master_14.1.1' into master_14.2.1
...
Former-commit-id: 34f830b4933bd6c7149757ce34136c7a18d030bf
2014-03-24 07:01:29 -04:00
Brian.Dyke
37b6368268
OB_14.1.1-24 baseline
...
Former-commit-id: 8b1e7457fc58021208e4233502f118cf34df7534
2014-03-21 12:43:50 -04:00
Ben Steffensmeier
933b172ca0
Issue #2932 improve compatibility of pop skewT and blended resources.
...
Former-commit-id: 49ffd67e77fef3c76f712cdf0eaa9b5e8ecff737
2014-03-20 13:18:40 -05:00
Nate Jensen
747ac58166
Issue #2919 fix windows error due to gempak library missing
...
Former-commit-id: 5a2ba132d9e32ce8a018f35ba2524881e5276120
2014-03-20 09:38:07 -05:00
Brian.Dyke
d23acbdd48
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: 0ea874227f20f9f7fe19fc8371e10711023c3f53
2014-03-14 11:13:30 -04:00
Brian.Dyke
030a18f804
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: 39f4506422c590b7520957923a5b00fd16aa19d0
2014-03-14 10:15:53 -04:00
Brian.Dyke
d4b6d22ae2
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: 3605f0373a6ce7b417d942991e50029c2d0c964b
2014-03-14 08:44:39 -04:00
Brian.Dyke
dcc2e4fd61
OB_14.1.1-23 baseline
...
Former-commit-id: b3292d88eee345fca27d9ca645ec2686d0114e5c
2014-03-14 08:18:16 -04:00
Kevin P. Johnson
b2797a0788
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: fad7cf2e6661aa0bcc9c37499e0560b708f192f0
2014-03-13 20:42:12 +00:00
Ben Steffensmeier
77041e5b17
Issue #2528 Fix satellite units/style.
...
Former-commit-id: 7e38454a31aa55c606c155a108253c0433ecb517
2014-03-12 14:19:49 -05:00
Richard Peter
18234c5d73
Merge "Issue #2678 end retrieval double clutching Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc" into omaha_14.2.1
...
Former-commit-id: 555358125bfb925a2c8ed0d393911b4d045d18b1
2014-03-11 16:43:37 -05:00
Dave Hladky
3500ad262a
Issue #2678 end retrieval double clutching
...
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc
Former-commit-id: 31a35e35b75bc9e6efc43af1da0b184c1828ff45
2014-03-11 15:53:59 -05:00
Nate Jensen
85f5821a6f
Merge "Issue #2896 Fix sat best res on weird projections" into omaha_14.2.1
...
Former-commit-id: d463531d4cf3bce8862ce1c29b12e9a594d8c63b
2014-03-11 12:35:44 -05:00
David Gillingham
b0783b64ce
Issue #2509 : Fix static topo generation break caused by baseline merge.
...
Change-Id: I4300af81de44639a6ac55b968f18730f698e3b68
Former-commit-id: 09a2f9e3ccabc82cbea9556351bdc02bb1c350c7
2014-03-11 11:54:25 -05:00
Ben Steffensmeier
8bb517836a
Issue #2896 Fix sat best res on weird projections
...
Former-commit-id: 029b8b30365fd3ec2cb9f5139dec02cc918a0dbb
2014-03-11 11:07:43 -05:00
Nate Jensen
ccb06db199
Issue #2779 update memory settings for renamed NC perspective
...
Former-commit-id: bc1c10ee0039906ec0b48e834e533332611ac0d3
2014-03-11 10:28:01 -05:00
Brian.Dyke
552490206f
Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: eaa41b4f2dd9fce2d957a2311ee3f4f04f220365
2014-03-11 10:44:03 -04:00
Juliya Dynina
6bbd88e62c
Merge "ASM #349 - Workaround for QPID-5569" into asm_14.2.1
...
Former-commit-id: a167748b77baad66784893304a18e8866f5471f1
2014-03-11 09:24:12 -05:00
Brian.Dyke
c6f2010ce6
Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: 0e02910adc2ef73df2eff5b41c1e9945a5536a0a
2014-03-10 15:42:38 -04:00
brian.dyke
654778bb0d
Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1
...
Former-commit-id: 9dba33a7122e20c0502b2bf8036ec875e957798b
2014-03-10 15:36:56 -04:00
Brian.Dyke
d710aec521
Merge branch 'ncep_14.2.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.1
...
Former-commit-id: ac54324fb0eff1483dd2c3aa8d94273760451dab
2014-03-10 15:14:59 -04:00
Nate Jensen
6a75fe686a
Issue #2779 add .ini generation of memory settings for other components
...
Former-commit-id: 71a7f485c5a32caeabc98f23164c9fc87cfa1787
2014-03-10 10:03:02 -05:00
Stephen Gilbert
65dd8b4c3c
VLab Issue #3224 - NSHARP: Fix erroneous mixing heights
...
Change-Id: Ib27352c1f0e5f2ee860577e5b3e96be5252902f2
Former-commit-id: 459cd2e6772efa05a683073798a1d4424aa2facf
2014-03-07 19:10:08 -05:00
Stephen Gilbert
9a457213bb
VLab Issue #3223 - NSHARP: Improve selection operation
...
Change-Id: I4d0e92d1db24b3136f60fa224c908dfc020afa1d
Former-commit-id: 16fcc171c65d79d5698feeb3ff0ace49c31d976f
2014-03-07 19:07:28 -05:00
Stephen Gilbert
1632166902
VLab Issue #3222 - Fix for Plotmodel CAVE hangs in NCP
...
Change-Id: I825c3b0af5177258f531b625f2cc66761e932d57
Former-commit-id: 24e07a3215a7879e459afc74e020eab0a8e1c646
2014-03-07 18:49:21 -05:00
Stephen Gilbert
625fcb0064
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: 4f58998c899e28521658bf17dee852592c534713
2014-03-07 18:36:42 -05:00
Steve Harris
92232fa063
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 81f446dbc2ae8f8c54cba5b29ed57f113d318160
2014-03-07 15:16:18 -06:00
Shawn.Hooper
41a4905f9f
ASM #224 - WarnGen: OB13.5.2 Template Errors
...
Change-Id: I68e8942e90fb62388b2c400f6a54f3de1a3f1c28
Former-commit-id: b18b8f64040b1c41810f391b8ed785327b6e5d59
2014-03-07 14:53:54 -05:00
Shawn.Hooper
670da1895b
ASM #377 - Baseline National River Location Database fails
...
Change-Id: Idbad0e02ca895b7e649c9d3e7165673fbd1cbaae
Former-commit-id: 5dcb5b019f389e64435b0283d95fe477032d88cc
2014-03-07 13:12:11 -05:00
Shawn.Hooper
8c9f9b3ae0
ASM #378 - MPE gages are not listed/available in gage table
...
Change-Id: I1a061e6cf8a6364e4401ea4524e3fc0c8cad9b6a
Former-commit-id: 55b1066b8674a044602297e64cb557ced5faf92a
2014-03-07 12:57:36 -05:00
Brian.Dyke
3ac2a61218
Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1
...
Former-commit-id: 8b6d5b889e652cbf82c66ae831c9c116626c1494
2014-03-07 11:50:06 -05:00
David Friedman
2c1a3442d6
ASM #349 - Workaround for QPID-5569
...
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce
Former-commit-id: 18d692c17ea11537d0eb832fbe63a04b59b0040c
2014-03-07 14:58:09 +00:00
Brian.Dyke
394076196b
Merge branch 'master_14.1.1' into master_14.2.1
...
Former-commit-id: 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7
2014-03-07 09:01:09 -05:00
Brian.Dyke
312cd8a3e8
Merge branch 'fun_merge' into master_14.2.1
...
Former-commit-id: bb169bc0992f28fe1527cb0106771c35415cea24
2014-03-07 08:57:07 -05:00
Brian.Dyke
21f17d4f9b
14.1.1-22 baseline
...
Former-commit-id: ae37ad5bac445251d1456f37588819fccfede061
2014-03-07 08:49:00 -05:00
Steve Harris
7f1ad89df9
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 22538918b8a7175bbb517cbf65ec3738e65a6eb2
2014-03-06 18:19:55 -06:00
David Friedman
11d0d191fd
ASM #74 - Fix RadarServer configuration import utility JAR dependency
...
Change-Id: I36dbd6f75d0183831fba92d2325c7c182c1dea70
Former-commit-id: 1a4183ed991cf1aed5895334c7b823a66ad58a7a
2014-03-06 17:07:23 +00:00
Brian.Dyke
b8fd0f16ed
Merge 13.5.3 DR_16824
...
Former-commit-id: 1b9ed749da0d1893f44e68400644f37c763e324a
2014-03-06 11:22:08 -05:00
Brian.Dyke
1778d20745
ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change)
...
Former-commit-id: 85700a6c632125b5f1d36b37a70767fbd9819142
2014-03-06 11:04:34 -05:00
Brian.Dyke
2dbac1697d
ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf)
...
Former-commit-id: c1dc533bf7ee6500da3f6d75699ad7758a39462b
2014-03-06 10:56:44 -05:00
Brian.Dyke
db274c890f
ASM #124 - Display GLD360 lightning data
...
Former-commit-id: 1edba9216beac913f9bd867da9988e213394a396
2014-03-06 10:54:15 -05:00
Steve Harris
069093884f
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
...
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.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.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: 889200c9eb3fbb835f8fef067476799f30a7a7e0
2014-03-06 08:39:43 -06:00
