Fay.Liang
c174a5ff27
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: a8eb3c2346609e0ca351c494c5bdfa2090423019
2015-04-02 11:33:37 -04:00
Fay.Liang
bd4ad0a5c3
Merge branch 'emc_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 4097a0a5dff82ca332d88aac01dc67c26c4a45d4
2015-04-02 11:31:31 -04:00
Rici.Yu
d47caf2552
ASM #17194 - convert SerpConfig.py from smart tool to utility
...
Change-Id: I8007ca1676de148aa42c5b15c8e3366bbe8c8e5d
Former-commit-id: 6968986c535bbadee8436cca5cfcc329d47c606b
2015-04-02 10:48:25 -04:00
Ron Anderson
0ddda332a3
Omaha #4288 Fixed widget is dispose error in FileTreeView
...
Change-Id: I38b8af21ee8a6ce22bd67eee1abb8e51dc7fb1b9
Former-commit-id: 8791485de7c0885f33d03ed67cf0352406caf1a6
2015-04-02 09:26:13 -05:00
Ron Anderson
c4b4343573
Omaha #4357 Comment out all product IDs by default they will be enabled at a later date.
...
Change-Id: I4e4683e0d5468e77b67ceee4de859129cfca0bec
Former-commit-id: 760b479895474dbd237f9b6d72913cfc4d937b90
2015-04-01 16:55:05 -05:00
Ron Anderson
fe590ee494
Merge "Omaha #4103 : Create delta script to migrate svcbu.properties file." into omaha_15.1.1
...
Former-commit-id: ad283a5f7e7a9170229c288cf6d9f82fefd4d1d9
2015-04-01 16:50:46 -05:00
Chris Cody
c69343b6de
Omaha #4198 Add User Permissions for editting Hazard Services settings
...
Former-commit-id: db304c599bdaa54280d9be0a859f840175ff0601
2015-04-01 15:46:10 -05:00
David Gillingham
a43bd0cb97
Issue #4344 : Update build.properties for spellchecker plugin to include plugin.xml.
...
Change-Id: I1a9009ed0d165ed48c81dfd088bf6652ae68110e
Former-commit-id: e4860cdd30d96bf7fc4347a3c92712e5350adf25
2015-04-01 15:43:42 -05:00
Fay.Liang
8bd8208c4c
ASM #17024 - Check-in library.ohd.pproc.so after merge/build from 14.4.1-21 to 15.1.1
...
Former-commit-id: ef3c93c82e72b9c574c2bbba8536e568e2a078ac
2015-04-01 14:56:17 -04:00
Matthew Howard
24758c7f16
Merge "ASM #17288 - GFE: Implement missing RTMA/URMA parameters" into asm_15.1.1
...
Former-commit-id: eda07c47b4b4ef6dbcc5361d76a3c4713e8f4150
2015-04-01 13:53:12 -05:00
Jingtao Deng
7ce9e7833d
VLab Issue #6751 - DR16848 MPE color scale merge problem; fixes #6751
...
Change-Id: Ib85e9943c93f89b74d8f1530a99f7e819c63e7e6
Former-commit-id: 1324a6ebb687b9af972562c7b1adca402b799ced
2015-04-01 13:50:45 -04:00
Fay.Liang
bac9b97816
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Former-commit-id: 3ce780c9d7ab5a190ebe7d87c1d9a839ca041f66
2015-04-01 13:28:26 -04:00
Shawn.Hooper
180d492706
ASM #17144 - Revert "ASM #17144 - GFE: Add Capabilities for CONUS Real-Time Mesoscale Analysis at 2.5km"
...
This reverts commit 0a6a2f8cd9
2015-04-01 13:23:24 -04:00
Fay.Liang
8ce086e41a
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Former-commit-id: 5e481a056337b7f502921886725382258c6e29d1
2015-04-01 13:04:48 -04:00
Shawn.Hooper
bcc715029e
ASM #14920 - Re-commit original change to Init.py (only file change needed for this DR)
...
Change-Id: I5258489f4eeac43771dccc87a97100676b0bd317
Former-commit-id: 7af1276495ce7f6a1a8cc5679f42e4a64dbd3dff
2015-04-01 12:42:35 -04:00
Shawn.Hooper
0dbe5119a5
ASM #14920 - Revert "ASM #14920 - GFE: Smartinits not calculating 12hr PoP correctly"
...
This reverts commit f1772fc7e2
2015-04-01 12:39:52 -04:00
Greg Armendariz
0d56041c75
Omaha #4103 - Remove svcbu.properties from RPM package list
...
Former-commit-id: d2af97d5e158148cdaafb2c619b4f393e99d4483
2015-04-01 11:12:04 -05:00
Bruce.Hundermark
d262c0e3d6
ASM #17288 - GFE: Implement missing RTMA/URMA parameters
...
Change-Id: If7824ab1a777d21209750bedf2a6c9cf219eaaf5
Former-commit-id: b3a14027d7b87055b51c7bb8ea85c0a5412c5888
2015-04-01 16:08:41 +00:00
David Gillingham
9abb40e066
Omaha #4103 : Create delta script to migrate svcbu.properties file.
...
Change-Id: Id6788242786717c2ebecb96b48061a5f2e41af0a
Former-commit-id: 71a72608de003c45cf6026849b2825d64e8b56b3
2015-04-01 11:00:35 -05:00
Fay.Liang
7809af88b9
Merge tag 'OB_14.4.1-21' into master_15.1.1
...
14.4.1-21
Former-commit-id: f13fe9af9cb5278362da4b3c67c5997b8ecedd1a
2015-04-01 10:27:48 -04:00
Brian Rapp
872c33c87f
ASM #17251 - "Final check-in"
...
Change-Id: Ia349e87470ee17ced61b00b69d3ff2ddfc3d5310
Former-commit-id: 82b137390073bf20e37f4e67bb87b899030d1c6f
2015-03-31 17:04:05 -04:00
Fay.Liang
5ad29ee888
Merge branch 'master_14.4.1' into asm_14.4.1
...
Former-commit-id: 4a76f9bb72ade29ca23a158c0cb2ef038905fd07
2015-03-31 15:02:33 -04:00
Richard Peter
75a72d6d2b
Merge "Omaha #4319 Set default volumescannumber in upgrade script." into omaha_15.1.1
...
Former-commit-id: 20cedd4cfb5ce55c3407805afa7067b0ea89aa9f
2015-03-31 14:00:37 -05:00
Nate Jensen
df5c60caa0
Merge "Omaha #4198 Add User Permissions for editting Hazard Services settings" into omaha_15.1.1
...
Former-commit-id: 9098c246c70ae481b75f7f968f0d3ae0253f2d5c
2015-03-31 10:51:10 -05:00
Ben Steffensmeier
8fd3ff4995
Omaha #4319 Set default volumescannumber in upgrade script.
...
Former-commit-id: 63c6cf4c36b27bd0c9b5c5dd31c4dd463b5c3343
2015-03-31 10:33:12 -05:00
Ron Anderson
b7b95dbfcc
Merge "Omaha #4103 : Move svcbu.properties into the localization store." into omaha_15.1.1
...
Former-commit-id: 326344df5c72d2c77f30dd7e6d030e3f9e5aeef5
2015-03-30 16:24:57 -05:00
David Gillingham
108c6caa2f
Omaha #4103 : Move svcbu.properties into the localization store.
...
Change-Id: I95001ee02f06594b15a451f938736bc7cb93d8be
Former-commit-id: 4b201b0a5cee53f2ffd8427d08252f6d0c83f47c
2015-03-30 16:05:57 -05:00
Chris Cody
b1d61503ae
Omaha #4198 Add User Permissions for editting Hazard Services settings
...
Former-commit-id: 34bcb22edb08289c1b4538c3ecafac233f2e9103
2015-03-30 16:04:23 -05:00
Ana Rivera
628d228957
VLab Issue #7280 - NWPS:Add missing smartinit file (nwpsTrkngCG0.py) and remove extra parenthesis in nwpsCG1.py
...
Change-Id: I4dd0e31e936720c07b40a905017958d3f4def649
Former-commit-id: e3b0aef8afd48c54a3d947e5bbbe67c238f1fdd2
2015-03-30 20:51:57 +00:00
Fay.Liang
3bd4d76143
Merge tag 'OB_14.4.1-20m' into master_15.1.1
...
14.4.1-20m
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
edexOsgi/build.edex/esb/conf/logback.xml
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 1d282a64da2998d91040a7c97f2e81beea0a8da4
2015-03-30 14:28:30 -04:00
David Gillingham
19043b866a
Issue #4344 : Make suggestion blacklist for spellchecker configurable via localization.
...
Change-Id: I1e73afcc2433329bb6b3c3200d776711dc1d7600
Former-commit-id: 44e092d35e214c8f11fedb1c4aee0f78e4f82acc
2015-03-30 11:57:33 -05:00
Steve Harris
1aab7b1831
Merge tag 'OB_15.1.1-2m' into omaha_15.1.1
...
15.1.1-2m
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 7cad81591e22bc1a46f54982f0cd0ca647208290
2015-03-30 11:07:52 -05:00
Yun.Teng
e40e907797
ASM #17206 - Change some parametes that are not rate parameters
...
Change-Id: I8420e3d3b85e32420c5c91b802f7cdccc035bc2f
Former-commit-id: 23927a6c91076fedc6d53eb5ba2882166814134a
2015-03-30 16:39:34 +01:00
Fay.Liang
e7d2d5e901
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: f8b4d9d81247c6089960c83b57417a5ba62cdfc2
2015-03-27 15:16:09 -04:00
Fay.Liang
869fd74e46
Merge branch 'omaha_14.4.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 61ce9a778c934223e30012c15000bf82f9a19ffe
2015-03-27 15:11:09 -04:00
Fay.Liang
cf8cd9d051
Merge tag 'OB_14.3.2-24m' into master_14.4.1
...
14.3.2-24m
Conflicts:
rpms/awips2.core/Installer.gfesuite-server/component.spec
Former-commit-id: a91ad7ff32c153c34d6982f29cc497812d9f22f7
2015-03-27 15:07:28 -04:00
Dave Hladky
8e984dc155
Omaha #4260 Added default Model
...
Former-commit-id: 86b1776063d04edb6133f57fabdaf04840880774
2015-03-27 13:44:17 -05:00
Ana Rivera
bcc40073df
Merge "VLab Issue #7249 - Removed extra dashes from baseTDLSurface.xml commented code; fixes #7249 " into field_15.1.1
...
Former-commit-id: aabaec95f61e69d40604b1e1a0c69d83de4a901a
2015-03-27 18:03:19 +00:00
Joshua Watson
5323c60d8f
VLab Issue #7249 - Removed extra dashes from baseTDLSurface.xml commented code; fixes #7249
...
Change-Id: Ifda3cd240b123f2f82b67e7978d2abfee12b247d
Former-commit-id: d5225988678e3bd26470ceb40a24bb7dc6a58af0
2015-03-27 11:53:52 -04:00
Sean.Webb
d93c0ec88c
Merge "ASM #17221 - Updated LDM to 6.12.9" into asm_14.4.1
...
Former-commit-id: ec7696a5ca44ccdebf86888d27e3fcb151576a61
2015-03-27 08:06:00 -05:00
Sean.Webb
022b59e739
ASM #17221 - Updated LDM to 6.12.9
...
Change-Id: Ib01372e3d0365404c9c8c94b951536d671ec5319
Former-commit-id: 3fb2bed462ec0cb2f985b80a4ea02192eac917db
2015-03-27 07:58:40 -04:00
Ron Anderson
e6cfc5f40d
Omaha #4027 Convert all GFE text products to mixed case
...
Change-Id: I94275b65e8733d5bed1242f78503f1613b2e0aff
Former-commit-id: 07088e71d78d6302da23683894d96d72e4f69a96
2015-03-26 18:30:39 -05:00
Steve Harris
f73567ec1f
Merge "Omaha #4337 - merge modification of logback.xml" into omaha_15.1.1
...
Former-commit-id: 556a47e626b3b90b46ece02451c580d95734377a
2015-03-26 16:02:10 -05:00
Steve Harris
6486a684a2
Omaha #4337 - merge modification of logback.xml
...
Former-commit-id: 8f555a33c557fabce3c9035bdd91c8627362cf50
2015-03-26 15:56:04 -05:00
Matthew Howard
9318a680cf
Merge "ASM #17144 - GFE: Add Capabilities for CONUS Real-Time Mesoscale Analysis at 2.5km" into asm_15.1.1
...
Former-commit-id: 6ade9593a6d691196f0092398e88eacb00ae342e
2015-03-26 13:05:33 -05:00
Bruce.Hundermark
0a6a2f8cd9
ASM #17144 - GFE: Add Capabilities for CONUS Real-Time Mesoscale Analysis at 2.5km
...
Change-Id: I7074e60477da457820615d67b84394afb2cc5d5e
Former-commit-id: d8f747df842ba808a8df09392ff60071b0d3e987
2015-03-26 16:04:33 +00:00
Nate Jensen
8294179024
Merge "Omaha #4319 Save volume scan number" into omaha_15.1.1
...
Former-commit-id: 21c3e07d51bab18272d24cef6baf1dcf615ace69
2015-03-26 10:57:34 -05:00
Steve Harris
25bd3ee930
Merge tag 'OB_14.4.1-20m' into omaha_15.1.1
...
14.4.1-20m
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
edexOsgi/build.edex/esb/conf/logback.xml (moved to build/deploy.edex.awips2/esb/conf/logback.xml; also removed edexOsgi/build.edex/esb/conf)
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 0db97a3cefc6f709d336883202e51f1d5255ad75
2015-03-26 09:57:17 -05:00
Melissa Porricel
d96bbe4799
ASM #16905 - Implement missing RTMA/URMA parameters
...
Change-Id: I4ec616b80b6c8f85bafec46f0c840c3c43a9c527
Former-commit-id: d68078b665787d91bfd92440345d41f9fcc98b3d
2015-03-26 09:58:45 -04:00
Steve Harris
68f4b3c18f
Merge tag 'OB_14.4.1-20m' into omaha_14.4.1
...
14.4.1-20m
Former-commit-id: dc7c935e809764604aa7f773b7123630dd818dd5
2015-03-26 08:26:55 -05:00
