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
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
Brian.Dyke
48cc3b6c55
Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1
...
Former-commit-id: 1fe5504d4c3ac2a61218
2014-03-07 11:50:06 -05:00
David Friedman
103fece7b7
ASM #349 - Workaround for QPID-5569
...
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce
Former-commit-id: a58f3cb7df2c1a3442d6
2014-03-07 14:58:09 +00:00
Brian.Dyke
a0e3f08fce
Merge branch 'master_14.1.1' into master_14.2.1
...
Former-commit-id: 7b798ab5d2394076196b
2014-03-07 09:01:09 -05:00
Brian.Dyke
0bbf137b05
Merge branch 'fun_merge' into master_14.2.1
...
Former-commit-id: 6414bdab57312cd8a3e8
2014-03-07 08:57:07 -05:00
Brian.Dyke
fe30e1d545
14.1.1-22 baseline
...
Former-commit-id: 08d8f1a0ee21f17d4f9b
2014-03-07 08:49:00 -05:00
Steve Harris
3358e8d6ef
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: a2e36f4c6c7f1ad89df9
2014-03-06 18:19:55 -06:00
David Friedman
fa849dfefa
ASM #74 - Fix RadarServer configuration import utility JAR dependency
...
Change-Id: I36dbd6f75d0183831fba92d2325c7c182c1dea70
Former-commit-id: d08597a0d411d0d191fd
2014-03-06 17:07:23 +00:00
Brian.Dyke
7baa5ee0d5
Merge 13.5.3 DR_16824
...
Former-commit-id: dafe7e6a42b8fd0f16ed
2014-03-06 11:22:08 -05:00
Brian.Dyke
26fe429c4b
ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change)
...
Former-commit-id: 010b7a1df51778d20745
2014-03-06 11:04:34 -05:00
Brian.Dyke
6313b7af0c
ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf)
...
Former-commit-id: cb1b4a7ac52dbac1697d
2014-03-06 10:56:44 -05:00
Brian.Dyke
bd81ebd8c2
ASM #124 - Display GLD360 lightning data
...
Former-commit-id: eefe8c45fedb274c890f
2014-03-06 10:54:15 -05:00
Steve Harris
3ba28aabea
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: ffcc34f8d4069093884f
2014-03-06 08:39:43 -06:00
Steve Harris
1a666f9f71
Merge branch 'master_14.2.1' into ncep_14.2.1
...
Former-commit-id: 4b01c57c0a167ce61d6c
2014-03-05 13:00:23 -06:00
Lee Venable
f38afb0976
Issue #2833 - fixed a widget disposed error.
...
Former-commit-id: 980e21ca5ae71dad9c80
2014-03-05 08:37:13 -06:00
Benjamin Phillippe
7bf51d507e
Issue #2769 : Added batching to registry sync
...
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db
Former-commit-id: 9fd35140f059323be87e
2014-03-04 13:31:41 -06:00
Richard Peter
5280398130
Merge "Issue #2769 : Registry database deadlocking fixes/performance improvements" into omaha_14.2.1
...
Former-commit-id: f9bd27c061aa8e1a3625
2014-03-04 12:54:23 -06:00
Nate Jensen
af76b58b27
Issue #2813 fix subscription package names
...
Former-commit-id: d7d0803ee90ec866f1d2
2014-03-04 10:53:58 -06:00
Brian.Dyke
271ec85c0c
OB_14.1.1-21 baseline
...
Former-commit-id: 29681c7ca41d92e5bab6
2014-03-04 11:47:42 -05:00
Benjamin Phillippe
d339e232f4
Issue #2769 : Registry database deadlocking fixes/performance improvements
...
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0
Former-commit-id: 5483d6d7aeed050996a2
2014-03-03 10:57:16 -06:00
Lee Venable
e34e636dc7
Issue #2795 - removed test code.
...
Former-commit-id: f94bcc4d3f28fe1e99e2
2014-02-27 15:46:30 -06:00
Richard Peter
c267c5a08f
Issue #2509 : Fix Merge of 13.5.2-4 ncep resources
...
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3
Former-commit-id: 862069dfd386d42ed603
2014-02-27 13:46:47 -06:00
Richard Peter
a23c8f2c27
Issue #2509 : Fix merge of SS #124
...
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1
Former-commit-id: d54fee5dae729d608a15
2014-02-27 13:20:49 -06:00
