Sean.Webb
69c5318fe7
Merge "ASM #550 - Remove ITO call from monitor_qpid_hosts.sh" into asm_14.3.1
...
Former-commit-id: 1e0452f11fbbc45406b0652c0caa3ec800bfa6f7
2014-06-02 10:15:07 -05:00
Sean.Webb
94f2a4ab2a
Merge "ASM #557 - Removed rh6 dependency from wxgtk rpm requirements" into asm_14.3.1
...
Former-commit-id: ca4cde97f7304f94bb990dcd53ac39e06c09c7de
2014-05-30 14:42:34 -05:00
Sean.Webb
73c2add28e
ASM #557 - Removed rh6 dependency from wxgtk rpm requirements
...
Change-Id: I5a59edfb974c945a4d382fad109e513e3a51eeee
Former-commit-id: bba964bd6af7d307a27ee85b11bce03d79f52e97
2014-05-30 14:40:44 -04:00
Sean.Webb
75f8e82eeb
ASM #552 - Increased postgres max_connections to 400
...
Change-Id: I6e4a3c02ff2645480ca20274f1fa445e25196a03
Former-commit-id: 88147ed5e5cd84e40acf61ad46d1baa554fd4e28
2014-05-30 14:27:59 -04:00
Sean.Webb
42b78d7ec0
ASM #550 - Remove ITO call from monitor_qpid_hosts.sh
...
Change-Id: I685b7ea1f2ed6d1eeb91e933b76eee051a3332f8
Former-commit-id: 43c50503e9aadc3dc66cdbf6b50f18a642547f35
2014-05-30 14:09:16 -04:00
brian.dyke
03cc2fbbfb
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 2e170e3e328804a56f65de7cec0f0e89d3f1aba4
2014-05-30 10:09:00 -04:00
Shawn Hooper
87d98c31fb
Merge "ASM #600 - the fixes for DR 17380" into asm_14.3.1
...
Former-commit-id: 25235d87722f50f4bd034002f2b9d7f1f9dfcd42
2014-05-28 13:04:45 -05:00
Fay.Liang
f56d9511b8
ASM #600 - the fixes for DR 17380
...
Change-Id: Iacd1c3dde4f43086dc1ba60ae47e1b0066a0187a
Former-commit-id: 445239c00cbe2147c014e180570085be6224da79
2014-05-27 16:04:22 -04:00
David Friedman
602150ea73
Merge "ASM #512 - Need radar data watchdog functionality" into asm_14.3.1
...
Former-commit-id: 9de711dfd85512d7bbdee2c91132d5250373c676
2014-05-27 15:03:48 -05:00
Daniel.Huffman
8326f42ed8
ASM #512 - Need radar data watchdog functionality
...
Change-Id: I54bb10185d5940d27417d1d40e21310ed5aeb8e3
Former-commit-id: b3f33a3c49607219a234bede34bd983178151f39
2014-05-27 19:59:53 +00:00
Steve Harris
3b16bbafb1
Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
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
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml
Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66
Former-commit-id: 117fa26f537131552bbe51b2c5fe12405a26db32
2014-05-27 14:48:24 -04:00
brian.dyke
1976d2e1fd
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 861a76d237eb18effd3bc52731875b10b84389d4
2014-05-23 08:58:39 -04:00
Stephen Gilbert
4299e7c72c
VLab Issue #3720 - NCEP EDEX and EDEX Common delivery for 14.3.1
...
Removed dependency on persistCamelRegistered from ncgrib spring config
Change-Id: I84e7b6fc6e50f9d1795e887a9fb30f9cdda3a7f8
Former-commit-id: a7140f38a54a577dd2d62cc551ab182b561f6fc0
2014-05-22 14:35:49 -04:00
Stephen Gilbert
e73836f3b5
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
...
Former-commit-id: d2d54ee2bfbbe6fef44df58d2edc3b5858ffbe22
2014-05-22 13:31:12 -04:00
Stephen Gilbert
7992a6b15b
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
Change-Id: Id609c4bd0e120f357b15c8a859ec0ece54ed47e0
Former-commit-id: 42eab5bcfeae6a2e1db32b83a68249bb37c9584e
2014-05-22 12:39:09 -04:00
Matthew Howard
e17f8a0082
Merge "ASM #256 Can't see model data for neighboring sites in ISC mode w/o toggling button" into asm_14.3.1
...
Former-commit-id: 5893d06b990cec295338595b006a45bb762b4b73
2014-05-22 07:50:50 -05:00
Zhidong.Hao
77ac5458d0
ASM #256 Can't see model data for neighboring sites in ISC mode w/o toggling button
...
Change-Id: I764436168339ce46ab01b27c9078455e6a543176
Former-commit-id: d4be1e866c561717a9a7697b3ff451efdd184fe6
2014-05-21 09:15:41 -04:00
Brian.Dyke
db68b80bbd
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
Former-commit-id: ed430b59789d9a00e20bdaadc8d55b92a4a4064b
2014-05-20 14:35:34 -04:00
Brian.Dyke
8c2cccb930
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-8 into 14.2.1
...
Former-commit-id: d9c230fbd50cc5acf1dd5c7c5e775f337de41921
2014-05-20 12:08:29 -04:00
Brian.Dyke
abf0f995cd
CM-MERGE:OB13.5.5-9 into 14.1.2
...
Former-commit-id: a2e2daca86d7efb28cb4e3eb8b9ef2ac92e1fc22
2014-05-20 11:56:30 -04:00
Brian.Dyke
d5a4669fc4
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-6,-7 into 14.2.1
...
Former-commit-id: 19032f03b1d2166f4afd936bb2b56e0b4851d9f4
2014-05-19 14:07:04 -04:00
Brian.Dyke
06c2478539
CM-MERGE:OB13.5.5-8 into 14.1.2
...
Former-commit-id: 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470
2014-05-19 13:26:45 -04:00
Shawn Hooper
342398e6a3
Merge "Revert "ASM #512 - Need radar data watchdog functionality"" into asm_14.3.1
...
Former-commit-id: ddeadcf968d945a322e8a9c8a8d25753782887f0
2014-05-19 12:18:46 -05:00
Shawn Hooper
20541c39ca
Revert "ASM #512 - Need radar data watchdog functionality"
...
This reverts commit 7e036b2bbc
2014-05-19 11:27:43 -05:00
Gang.Zhang
9c1587b92d
ASM #95 - Fix 0.0 for NO DATA Issue caused failed back.
...
Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac
Former-commit-id: 5880dcd0b727c3d473873b8382ace78955ab800b
2014-05-19 15:40:41 +01:00
brian.dyke
58683ad040
Merge branch 'master_14.3.1-4' into asm_14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199
2014-05-19 09:45:37 -04:00
Brian.Dyke
e9bd17a21f
CM-MERGE:OB13.5.5-7 into 14.1.2
...
Former-commit-id: 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114
2014-05-19 07:55:42 -04:00
David Friedman
a55e851780
Merge "ASM #240 - RPS lists delivered by awips2-rcm out of date" into asm_14.2.2
...
Former-commit-id: a4c1c5524c31384c3532076ee151fd9a294367d2
2014-05-16 16:40:38 -05:00
David Friedman
eab9a6b6d7
ASM #240 - RPS lists delivered by awips2-rcm out of date
...
Change-Id: I811bfebab480c5655f7260b85daa36f69e9550eb
Former-commit-id: 880c5d7259a5af17f2452fa3bd9f18d852c81d82
2014-05-16 21:38:34 +00:00
David Friedman
3b69a240c8
ASM #592 - RadarServer does not sent OTRs for RSS product to TDWRs
...
Change-Id: Iabb354391ea63b6f9c316ea8316fc28128a956f5
Former-commit-id: 4fd6bbfba29a39bf125269ab8342b826995e3d86
2014-05-16 21:34:59 +00:00
Brian.Dyke
dcd238c6a3
Merge branch 'omaha_14.2.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: 18486e2e8ead4614c05e3a7775cba95cd78053c8
2014-05-16 08:45:47 -04:00
Stephen Gilbert
e1b0c5f102
VLab Issue #3721 - NCEP CAVE plugin delivery for 14.3.1
...
Updates to various resource plugins such as ncgrid, plotdata, ncscat,
and ntrans
Change-Id: Ie04200519fad583d2b252ea161cb5c72eb90732c
Former-commit-id: 0832f7cdc3c6f020f5fe97dde01ed17cf98eebb2
2014-05-15 18:31:17 -04:00
Stephen Gilbert
d6f370db60
VLab Issue #3721 - NCEP CAVE plugin delivery for 14.3.1
...
PGEN Bug Fixes
Change-Id: Ie50d8f829e0dfb00fab254945a46592553cdb59c
Former-commit-id: 2f93fd7bdbcf1fa4698dfc2dd51c377db6d809b6
2014-05-15 17:40:04 -04:00
Stephen Gilbert
4f2a631e66
VLab Issue #3721 - NCEP CAVE plugin delivery for 14.3.1
...
Localization/configuration file updates
Change-Id: I489d8228f17534234cd8ea20e10a137a17bad054
Former-commit-id: c55835291b5d2bbe24c4398851e23a5c28d5e582
2014-05-15 17:25:39 -04:00
Stephen Gilbert
4d2154d2de
VLab Issue #3722 - SWPC delivery for 14.3.1
...
Upgrades to Geomag and solar image processing
Change-Id: Ibe33d00843419e34998274a87734f3f29d2b63dc
Former-commit-id: c9bcc3d15adcea014696e5cd68b9688506ee07d9
2014-05-15 17:24:13 -04:00
Stephen Gilbert
ca9b7c8dfc
VLab Issue #3720 - NCEP EDEX and EDEX Common delivery for 14.3.1
...
Table updates for GRIB decoding; Updates to gpd, mcidas, pafm, and pgen
plugins
Change-Id: Ic6874210998d7f5a6b164ef45c6918246388ee68
Former-commit-id: 3c904361e7176592cc873a3414c18ad5107aea54
2014-05-15 17:20:52 -04:00
Brian.Dyke
c8f21e92fe
Merge remote-tracking branch 'remotes/origin/master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-5 into 14.2.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
Former-commit-id: d75db45cdfa20fed7568b825ca0dfd8c8689d22a
2014-05-15 16:40:47 -04:00
Brian.Dyke
c81d54b651
CM-MERGE:OB13.5.5-6 into 14.1.2
...
Former-commit-id: 11acfb00bda7686c68e24903df4831cf57bf86de
2014-05-15 14:16:38 -04:00
Dave Hladky
783cd9e308
Issue #3168 Move DD retrieval distibution to correct feature/RPM
...
Change-Id: I1110eec9d4cde805a67cc33254b98fc00fd8a7b1
Former-commit-id: d94e7f139573caa508b260902870c9f745080bb8
2014-05-14 16:13:57 -05:00
Brian.Dyke
d3fa10028c
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-24 into 14.2.2
...
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
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
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: f7d6bee49c5777e5d63c724eba1242a1baf153ac
2014-05-14 16:08:16 -04:00
Shawn Hooper
24918bda30
Merge "ASM #560 - LDM 6.11.5 GRIB library causing crash Modified Release number in component.spce from 10 to 11" into asm_14.2.2
...
Former-commit-id: b774242fcff4bf603b82c8a6657e372d8bdc3c19
2014-05-14 14:39:57 -05:00
Qinglu.Lin
c5097660c2
ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
...
Change-Id: I31cc6fe46fff0f9246585ddbf84b2f94b3d8c22c
Former-commit-id: 763641d787f7f8c79bf28456314dcc16786702ed
2014-05-14 15:30:16 -04:00
Dave Hladky
15366714ed
Issue #3168 Move retrieval distribution to correct DD RPM
...
Former-commit-id: 228ef1ceb7337fa38c370c3218d1c32b4f1302fb
2014-05-14 11:12:55 -05:00
Steve Harris
70b95c7636
Merge branch 'master_14.2.1' (14.2.1-24) into omaha_14.2.1
...
Former-commit-id: 2627e4d38b3dcee82dcf7a6032d692170d50d9ad
2014-05-13 15:23:57 -05:00
Bryan Kowal
8d5326cc1b
Issue #3159 - rebuild with newer gridslice source
...
Change-Id: I78c2337af37289b8e1190b142778006dfbdb6ebc
Former-commit-id: 2b13221d7c644147f6eda1acb8b126667be00926
2014-05-13 14:43:04 -05:00
Brian.Dyke
fb4c7e55b3
Merge branch 'merge_resolutions' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1 CM-MERGE:OB14.1.2-4 into 14.2.1
...
Former-commit-id: 019c1405290753ed47cecd9a0bb26c220d78d010
2014-05-13 11:23:55 -04:00
Matthew Howard
576a2d63ec
Merge "ASM #509 GFE: Product editor still auto-wraps when the option is turned off" into asm_14.3.1
...
Former-commit-id: 2052df4ca5f68165b477994b21357c245ff73546
2014-05-13 07:49:18 -05:00
Paul.Grell
7e036b2bbc
ASM #512 - Need radar data watchdog functionality
...
Change-Id: I3bcdbe8f267f78be1d0bc64e466ffed70be011a3
Former-commit-id: ad727f0b3d820cf2310b4b8cc67639b6d141af6b
2014-05-12 20:00:18 -04:00
Richard Peter
dd35516290
Issue #2854 : Fix merge of textdb
...
Change-Id: I626eabc72fbedde983e592ec0c8fb50ed1f52ae3
Former-commit-id: 2335691bb79c14d96e286f9b0be0f5085711c7bc
2014-05-12 17:31:06 -05:00
Richard Peter
e3e9664336
Merge "Issue #2060 : Consolidate grid indexes." into omaha_14.3.1
...
Former-commit-id: 462ca3c56b516217043d09f9bf0c6c6b7a151044
2014-05-12 17:09:56 -05:00
