Fay.Liang
b0d72bf798
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
e1c2587055
Omaha #4330 - Fix developer build
...
Change-Id: Ic818ca89f44049a3d31583d0499d9e0756673eb2
Former-commit-id: d205922ba432e4f4b3c411ea798ee68c1563cd66
2015-04-06 10:47:23 -05:00
Ron Anderson
c456aa2776
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
920bf05b11
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
cdb3cdcc7d
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
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
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
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
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
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
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
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
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
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
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
Ben Steffensmeier
e1a3e0023e
Omaha #4319 Save volume scan number
...
Former-commit-id: 76cf847f8c8d7248f99db13ac59f34d1186e01e6
2015-03-25 18:05:00 -05:00
Ron Anderson
3fa5db60e5
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
63c77d96d1
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
dcfd2c2e7c
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
af4d82693a
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
fd5b270fdd
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
009fd8a059
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
9a12a4bca3
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
2eb8777058
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
77b87f33b5
Omaha #3959 - Fix subgrid bounds check
...
Change-Id: Ic8e47fbf38d333afe852afd92e9400787b8bca3b
Former-commit-id: ef7f5baa159e83540f16c4d8908ccd9c85668688
2015-03-18 14:40:47 -05:00
Fay.Liang
3b9e0864ab
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
6f8f2f5398
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
19f99823a6
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
2fd5ba420f
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
a4abe3ecc4
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
7db813d59c
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
1dcbfb01d7
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
dc59270db2
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
e3f07916ea
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
Fay.Liang
7a62d03b55
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: ff4a350eca07ea0f158ca0c3082890faa5bda368
2015-03-13 15:58:28 -04:00
Chris Cody
796a8b1eb0
Omaha #4198 Add User Permissions for editting Hazard Services settings; Part 2
...
Change-Id: I05e61388f61d7069e791a2d9bbf11dea846cd0fc
Former-commit-id: 62ffd525226a1cc5fe7f57c332d998e11c206417
2015-03-13 14:44:02 -05:00
Kenneth Sperow
7383b52812
Merge remote branch 'origin/omaha_15.1.1' into field_15.1.1
...
Conflicts:
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
Former-commit-id: 71473bbe9463dee8f0077d13dd25dfcee3b5e4f4
2015-03-13 11:40:02 -07:00
Richard Peter
10811f4612
Merge "Omaha #4128 : Refactor ISC and active table sharing code so that their beans perform cluster failover together." into omaha_14.4.1
...
Former-commit-id: 99f2b2f693e2e30903399ffc94a7f4d6a84e0fed
2015-03-12 20:03:41 -05:00
Ron Anderson
61cb550ad4
Omaha #4246 Changes to support VCModules at base, site, and user levels
...
Change-Id: I995ad5c185ec8c5f0056f28f7e2e1c5b5d7395fc
Former-commit-id: 33c2ab1111deb0ede6a3196d889475bc69dd63d4
2015-03-12 18:09:58 -05:00
Ron Anderson
fb6168d190
Omaha #3955 Additional updates to try to make the procedures more bulletproof.
...
Change-Id: Ie4c9d02c880dd460ef3470db9c68f5a67c0e924c
Former-commit-id: 1ff0a8ab8715a780fdc14db7f81f1708567fdc78
2015-03-12 16:23:37 -05:00
Shawn.Hooper
98f47b420c
ASM #17164 - Update gfesuite build files
...
Change-Id: I3f350beb10e2cb4b49d9f755e6cd9c549f1c95a4
Former-commit-id: 446c28f031dd408cea1f79c093d9239e47af0798
2015-03-12 17:14:33 -04:00
