Steve Harris
0db5e1ec86
Merge tag 'OB_15.1.1-4' into omaha_15.1.1
...
15.1.1-4
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 8e57da4bb70fda78c3aaa91add874cd403286939
2015-04-13 12:13:02 -05:00
David Gillingham
6393c83261
Omaha #4383 : EDEX support for alternate ISC databases with non-standard masking.
...
Change-Id: Ife4cae92aa1b097f2606396f9e11a7d17dc06d2a
Former-commit-id: aac0b3bd84a1753e816bd102cec8336e32aa0db9
2015-04-10 11:02:22 -05:00
Fay.Liang
1579e023ea
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 6608975224ad22f454a243c919d498a5a2369e32
2015-04-08 12:24:58 -04:00
Fay.Liang
7349df3d27
Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/export_configuration
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/proc_receive_config
Former-commit-id: 9742125df2b54fe54e1e06dba554de21db52f5a0
2015-04-08 12:22:27 -04:00
Greg Armendariz
4623588cc5
Omaha #4330 - Fix developer build
...
Change-Id: Ic818ca89f44049a3d31583d0499d9e0756673eb2
Former-commit-id: d205922ba432e4f4b3c411ea798ee68c1563cd66
2015-04-06 10:47:23 -05:00
Ron Anderson
4132bbf6cf
Merge "Omaha #4027 Convert all GFE text products to mixed case" into omaha_15.1.1
...
Former-commit-id: 67762d2b731cba6e8846ff04609454b354fa89a6
2015-04-02 17:05:47 -05:00
Ron Anderson
a957a36b4f
Merge "Omaha #4103 : Restore missing iscDataRec script, fix copy/paste errors in export_grids." into omaha_15.1.1
...
Former-commit-id: e9b6afa1ab2662de6b42fa334e9b149c21cdfdde
2015-04-02 16:30:00 -05:00
David Gillingham
c5dd1a0d93
Omaha #4103 : Restore missing iscDataRec script, fix copy/paste errors in export_grids.
...
Change-Id: I48de7074a034e1d1184e431f7f0e78221b96fad6
Former-commit-id: a108f2da18cd891db692c34d61f4281b815a8e09
2015-04-02 16:24:44 -05:00
Brian Rapp
099fba8402
Merge "ASM #17251 - "Final check-in"" into asm_15.1.1
...
Former-commit-id: f89be35bf18cac72007b82466a43f8f4be3cf3f6
2015-04-02 13:47:33 -05:00
Chris Cody
ad10e23f2a
Omaha #4198 Add User Permissions for editting Hazard Services settings
...
Former-commit-id: db304c599bdaa54280d9be0a859f840175ff0601
2015-04-01 15:46:10 -05:00
Matthew Howard
75a1e17bf4
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
Fay.Liang
a204a6210e
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
cc91b1a5df
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
714044cb9b
ASM #14920 - Revert "ASM #14920 - GFE: Smartinits not calculating 12hr PoP correctly"
...
This reverts commit 3c532660b0
2015-04-01 12:39:52 -04:00
Bruce.Hundermark
7647f6bc67
ASM #17288 - GFE: Implement missing RTMA/URMA parameters
...
Change-Id: If7824ab1a777d21209750bedf2a6c9cf219eaaf5
Former-commit-id: b3a14027d7b87055b51c7bb8ea85c0a5412c5888
2015-04-01 16:08:41 +00:00
Fay.Liang
77002144a1
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
42d6b54078
ASM #17251 - "Final check-in"
...
Change-Id: Ia349e87470ee17ced61b00b69d3ff2ddfc3d5310
Former-commit-id: 82b137390073bf20e37f4e67bb87b899030d1c6f
2015-03-31 17:04:05 -04:00
Nate Jensen
2cf7e1e79a
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
Ron Anderson
cbca87a1b7
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
806583afd9
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
dd65f28842
Omaha #4198 Add User Permissions for editting Hazard Services settings
...
Former-commit-id: 34bcb22edb08289c1b4538c3ecafac233f2e9103
2015-03-30 16:04:23 -05:00
Fay.Liang
133a603566
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
Steve Harris
7375074ed8
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
Fay.Liang
fed293e459
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
f3dcf799d6
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
14a05b15c6
Omaha #4260 Added default Model
...
Former-commit-id: 86b1776063d04edb6133f57fabdaf04840880774
2015-03-27 13:44:17 -05:00
Ron Anderson
ea0b02bedd
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
Nate Jensen
146a4e91f1
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
165971a4f6
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
9a2a726fb9
ASM #16905 - Implement missing RTMA/URMA parameters
...
Change-Id: I4ec616b80b6c8f85bafec46f0c840c3c43a9c527
Former-commit-id: d68078b665787d91bfd92440345d41f9fcc98b3d
2015-03-26 09:58:45 -04:00
Steve Harris
f099adad75
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
Ben Steffensmeier
e6a8f3e6a0
Omaha #4319 Save volume scan number
...
Former-commit-id: 76cf847f8c8d7248f99db13ac59f34d1186e01e6
2015-03-25 18:05:00 -05:00
Ron Anderson
863082515f
Merge "Omaha #4300 Client-side changes for multi-site service backup" into omaha_15.1.1
...
Former-commit-id: f6a14fd5ffa9a3629aae5a2d9a360b75bca31878
2015-03-23 17:33:08 -05:00
David Gillingham
46f6074201
Omaha #4103 : Save MHSID of failed site to ensure failed site grids are sent back to correct server.
...
Change-Id: Ibcb27a2c3005e209d4db8f5fe6d654b583e646a4
Former-commit-id: 72fb51b09d54160362c0c0d699bacca7cea49634
2015-03-23 16:20:56 -05:00
Ron Anderson
8c54ff2f61
Omaha #4300 Client-side changes for multi-site service backup
...
Change-Id: Ibcf05dfc67fa3824a5fe716e1d4038ad5aeb4034
Former-commit-id: 8daff8d5bb3e1bbf23a559671040cae4a03c9911
2015-03-23 16:08:31 -05:00
David Gillingham
6b7188f71d
Omaha #4308 : Ensure service backup handles mixedCaseProductIds.txt
...
Change-Id: Ie071c48ba4331af4d12681ec65f90cae4310abd0
Former-commit-id: c6a96c73e30394b4ee8b29b4dec1deb8a25ee72f
2015-03-23 10:07:22 -05:00
David Gillingham
a4d13dbabd
Omaha #4103 : Update GFE service backup server code to support multiple service backup sites, use "smarter" lock files to store additional status.
...
NOTE: Service Backup features are broken until DR 4300 lands on this branch.
Change-Id: Ic0184c10c553187c8d0515f639c5a33fd3abde1f
Former-commit-id: 732208b6600882a9ba9fcc0eefd7c8be0157beab
2015-03-19 16:13:56 -05:00
Fay.Liang
b23791cfbd
Merge branch 'ops_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 5879ba157369936274e88800e4f178e67567de95
2015-03-19 12:45:22 -04:00
Fay.Liang
2babd039f5
Merge branch 'field_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
...
Former-commit-id: 391ff6c59e4db20b42ea5ff52d7b37f4f49fc714
2015-03-19 12:41:59 -04:00
Fay.Liang
86a8041062
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/build.edex/edex/common.properties
Former-commit-id: ba576b948587ea7b1c077ebad7113bc4e7504c00
2015-03-19 12:35:31 -04:00
Richard Peter
9faf691a35
Omaha #3959 - Fix subgrid bounds check
...
Change-Id: Ic8e47fbf38d333afe852afd92e9400787b8bca3b
Former-commit-id: ef7f5baa159e83540f16c4d8908ccd9c85668688
2015-03-18 14:40:47 -05:00
Fay.Liang
1c80edbed0
Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: ec7875e9a4bec3752aeb8442fca15e4e4fd02571
2015-03-18 15:08:01 -04:00
Fay.Liang
3233640aa2
Merge ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 42d435f739134ec29a021415ed96b6c3406fc021
2015-03-18 14:54:46 -04:00
Steve Harris
9b749e134d
Merge tag 'OB_14.4.1-18m' into omaha_14.4.1
...
14.4.1_18m
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 390c7ec5c261717f6e0b2053761e12e1fcb68215
2015-03-18 13:09:03 -05:00
Steve Harris
67b3a77c4f
Merge tag 'OB_14.4.1-18m' into omaha_15.1.1
...
14.4.1_18m
Conflicts:
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: 41217304fa68101d17e003b2fa6992d0e15b083c
2015-03-18 09:29:01 -05:00
Ron Anderson
429d904d3e
Omaha #3955 Fix error in TopoDatabase when GFE domain is changed
...
Change-Id: I0afbffb8b4e0ece19281f62c593b270cb138048c
Former-commit-id: 1689d4433750ac388e9fe1f43b15545a7c398cbe
2015-03-17 16:32:42 -05:00
Melissa Porricel
fcdcb81963
ASM #7951 - Add Capabilities for CONUS RTMA at 2.5km
...
Change-Id: Iab79fc17b3b648ffa39c8385c581392e3cf58f9c
Former-commit-id: 9c7d466213eaac3a46fddf416967d00e3446bfee
2015-03-16 17:14:56 -04:00
Ron Anderson
ec0ba7510a
Omaha #3955 Fix null pointer in TopoDatabase when activating a new site
...
Change-Id: Ie1d558103a69eb6cb02629f3a3df961bf1955892
Former-commit-id: 1352570da1c69350a61b760ff0fe9829056dd5e1
2015-03-16 11:34:07 -05:00
Jason Burks
3d3f3a6535
VLab Issue #6926 - Moved LMA Menus to be in the lightning Menu; fixes #6926
...
Updated the based on feddback from Ben.
Change-Id: I2c400f98dc80ee2583818da26466fa9eac37f281
Former-commit-id: 56d2ffeaf8564c8ea02f52ef35e8aebea2e9f992
2015-03-14 14:36:37 +00:00
Fay.Liang
6293139493
Merge branch 'mdl_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 3b4b5c100cc6972beff6e22a609f069f97bdc765
2015-03-13 16:03:02 -04:00
