xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
8214 commits 31 branches 40 tags 3.8 GiB
Commit graph

8214 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fay.Liang
9d752cfc41 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: 7349df3d27 [formerly 9742125df2b54fe54e1e06dba554de21db52f5a0]
Former-commit-id: b0d72bf798
 2015-04-08 12:22:27 -04:00
Nate Jensen
c11528190e Omaha #4204 keep renamed parts on 4 panel action 
Change-Id: I76dcfa52bc79bd9274c11912e889728486d3ca4f

Former-commit-id: 78cc9fd16c [formerly 12207dc69597a229ca732b7dc90e2d75ebbc988b]
Former-commit-id: 2c0ed92ce6
 2015-04-07 11:15:13 -05:00
Greg Armendariz
f8a3dbb428 Omaha #4330 - Fix developer build 
Change-Id: Ic818ca89f44049a3d31583d0499d9e0756673eb2

Former-commit-id: 4623588cc5 [formerly d205922ba432e4f4b3c411ea798ee68c1563cd66]
Former-commit-id: e1c2587055
 2015-04-06 10:47:23 -05:00
Ron Anderson
cb89c792f3 Merge "Omaha #4027 Convert all GFE text products to mixed case" into omaha_15.1.1 
Former-commit-id: 4132bbf6cf [formerly 67762d2b731cba6e8846ff04609454b354fa89a6]
Former-commit-id: c456aa2776
 2015-04-02 17:05:47 -05:00
Ron Anderson
bd8117d486 Merge "Omaha #4103: Restore missing iscDataRec script, fix copy/paste errors in export_grids." into omaha_15.1.1 
Former-commit-id: a957a36b4f [formerly e9b6afa1ab2662de6b42fa334e9b149c21cdfdde]
Former-commit-id: 920bf05b11
 2015-04-02 16:30:00 -05:00
David Gillingham
a9fbea6386 Omaha #4103: Restore missing iscDataRec script, fix copy/paste errors in export_grids. 
Change-Id: I48de7074a034e1d1184e431f7f0e78221b96fad6

Former-commit-id: c5dd1a0d93 [formerly a108f2da18cd891db692c34d61f4281b815a8e09]
Former-commit-id: cdb3cdcc7d
 2015-04-02 16:24:44 -05:00
Nate Jensen
f14bb189d4 Merge "Omaha #4198 Add User Permissions for editting Hazard Services settings" into omaha_15.1.1 
Former-commit-id: df12c0d2a6 [formerly 3f0ab9760b2779fdb4a3557348acfa3547f30e08]
Former-commit-id: 7bf2da50bb
 2015-04-02 13:33:16 -05:00
Nate Jensen
7bfb787a2c Omaha #4204 retain part names when 4-panel swapped 
Change-Id: I86b364dfe879100fa81991ab31c0e8e1122d3862

Former-commit-id: 18f76ae519 [formerly b9c5c03f403d00b7fbf0ff5d9c8ed34c82556abd]
Former-commit-id: e3409e80a4
 2015-04-02 12:06:10 -05:00
Ron Anderson
38d35bd1e9 Merge "Omaha #4103: Create delta script to migrate svcbu.properties file." into omaha_15.1.1 
Former-commit-id: 1dddf3262f [formerly ad283a5f7e7a9170229c288cf6d9f82fefd4d1d9]
Former-commit-id: fe590ee494
 2015-04-01 16:50:46 -05:00
Chris Cody
c135fd55fb Omaha #4198 Add User Permissions for editting Hazard Services settings 
Former-commit-id: ad10e23f2a [formerly db304c599bdaa54280d9be0a859f840175ff0601]
Former-commit-id: c69343b6de
 2015-04-01 15:46:10 -05:00
Fay.Liang
e28fe86341 ASM #17024 - Check-in library.ohd.pproc.so after merge/build from 14.4.1-21 to 15.1.1 
Former-commit-id: 499a7c7e80 [formerly ef3c93c82e72b9c574c2bbba8536e568e2a078ac]
Former-commit-id: 8bd8208c4c
 2015-04-01 14:56:17 -04:00
Fay.Liang
8de77c61f0 Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1 
Former-commit-id: 6442ecb0b5 [formerly 3ce780c9d7ab5a190ebe7d87c1d9a839ca041f66]
Former-commit-id: bac9b97816
 2015-04-01 13:28:26 -04:00
Shawn.Hooper
259e516e6b ASM #17144 - Revert "ASM #17144 - GFE: Add Capabilities for CONUS Real-Time Mesoscale Analysis at 2.5km" 
This reverts commit abdd5d8e1f [formerly 0a6a2f8cd9] [formerly 0e155b267e [formerly d8f747df842ba808a8df09392ff60071b0d3e987]].
Removed 2 incorrectly committed files.

Change-Id: If5b28b69c5c9a6aef92bdef3f3be198f6e8be262

Former-commit-id: 934355efc8 [formerly 0a5f9f60d81009d125b7bbee4c6a974280918bb7]
Former-commit-id: 180d492706
 2015-04-01 13:23:24 -04:00
Fay.Liang
020a0fbe3a Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1 
Former-commit-id: a204a6210e [formerly 5e481a056337b7f502921886725382258c6e29d1]
Former-commit-id: 8ce086e41a
 2015-04-01 13:04:48 -04:00
Shawn.Hooper
dce64ae3f9 ASM #14920 - Re-commit original change to Init.py (only file change needed for this DR) 
Change-Id: I5258489f4eeac43771dccc87a97100676b0bd317

Former-commit-id: cc91b1a5df [formerly 7af1276495ce7f6a1a8cc5679f42e4a64dbd3dff]
Former-commit-id: bcc715029e
 2015-04-01 12:42:35 -04:00
Shawn.Hooper
1b7d9c601e ASM #14920 - Revert "ASM #14920 - GFE: Smartinits not calculating 12hr PoP correctly" 
This reverts commit 8d01fd11c7 [formerly f1772fc7e2] [formerly 3c532660b0 [formerly 5c2d02a67bd5b4594c6d90afcbae4e8159e0edd1]].
There were nativeLib files inadvertently committed to this DR.
They will be reverted and only the correct file will be committed.

Change-Id: I72750a5cc4a47603396cf89cd822d7cb0c53f55b

Former-commit-id: 714044cb9b [formerly aed96fb67913e5a300f5b201838ac3dd96d5f72b]
Former-commit-id: 0dbe5119a5
 2015-04-01 12:39:52 -04:00
Greg Armendariz
f119cf3335 Omaha #4103 - Remove svcbu.properties from RPM package list 
Former-commit-id: 1387d6117e [formerly d2af97d5e158148cdaafb2c619b4f393e99d4483]
Former-commit-id: 0d56041c75
 2015-04-01 11:12:04 -05:00
David Gillingham
a9bbffc855 Omaha #4103: Create delta script to migrate svcbu.properties file. 
Change-Id: Id6788242786717c2ebecb96b48061a5f2e41af0a

Former-commit-id: afc6b45fa0 [formerly 71a72608de003c45cf6026849b2825d64e8b56b3]
Former-commit-id: 9abb40e066
 2015-04-01 11:00:35 -05:00
Fay.Liang
43976af1ba Merge tag 'OB_14.4.1-21' into master_15.1.1 
14.4.1-21


Former-commit-id: 77002144a1 [formerly f13fe9af9cb5278362da4b3c67c5997b8ecedd1a]
Former-commit-id: 7809af88b9
 2015-04-01 10:27:48 -04:00
Richard Peter
88e1d2fbd3 Merge "Omaha #4319 Set default volumescannumber in upgrade script." into omaha_15.1.1 
Former-commit-id: 909aba7276 [formerly 20cedd4cfb5ce55c3407805afa7067b0ea89aa9f]
Former-commit-id: 75a72d6d2b
 2015-03-31 14:00:37 -05:00
Nate Jensen
50d5cd8895 Merge "Omaha #4198 Add User Permissions for editting Hazard Services settings" into omaha_15.1.1 
Former-commit-id: 2cf7e1e79a [formerly 9098c246c70ae481b75f7f968f0d3ae0253f2d5c]
Former-commit-id: df5c60caa0
 2015-03-31 10:51:10 -05:00
Ben Steffensmeier
a9850006b5 Omaha #4319 Set default volumescannumber in upgrade script. 
Former-commit-id: 888da5052c [formerly 63c6cf4c36b27bd0c9b5c5dd31c4dd463b5c3343]
Former-commit-id: 8fd3ff4995
 2015-03-31 10:33:12 -05:00
Ron Anderson
863c37a171 Merge "Omaha #4103: Move svcbu.properties into the localization store." into omaha_15.1.1 
Former-commit-id: cbca87a1b7 [formerly 326344df5c72d2c77f30dd7e6d030e3f9e5aeef5]
Former-commit-id: b7b95dbfcc
 2015-03-30 16:24:57 -05:00
David Gillingham
d4c8749898 Omaha #4103: Move svcbu.properties into the localization store. 
Change-Id: I95001ee02f06594b15a451f938736bc7cb93d8be

Former-commit-id: 806583afd9 [formerly 4b201b0a5cee53f2ffd8427d08252f6d0c83f47c]
Former-commit-id: 108c6caa2f
 2015-03-30 16:05:57 -05:00
Chris Cody
0157209729 Omaha #4198 Add User Permissions for editting Hazard Services settings 
Former-commit-id: dd65f28842 [formerly 34bcb22edb08289c1b4538c3ecafac233f2e9103]
Former-commit-id: b1d61503ae
 2015-03-30 16:04:23 -05:00
Fay.Liang
8f8f86f60c 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: 133a603566 [formerly 1d282a64da2998d91040a7c97f2e81beea0a8da4]
Former-commit-id: 3bd4d76143
 2015-03-30 14:28:30 -04:00
Steve Harris
de00ba4b57 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: 7375074ed8 [formerly 7cad81591e22bc1a46f54982f0cd0ca647208290]
Former-commit-id: 1aab7b1831
 2015-03-30 11:07:52 -05:00
Fay.Liang
8383682425 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1 
Former-commit-id: dd7c47b911 [formerly f8b4d9d81247c6089960c83b57417a5ba62cdfc2]
Former-commit-id: e7d2d5e901
 2015-03-27 15:16:09 -04:00
Fay.Liang
a2797cdcb5 Merge branch 'omaha_14.4.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1 
Former-commit-id: fed293e459 [formerly 61ce9a778c934223e30012c15000bf82f9a19ffe]
Former-commit-id: 869fd74e46
 2015-03-27 15:11:09 -04:00
Fay.Liang
cc7a2e7082 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: f3dcf799d6 [formerly a91ad7ff32c153c34d6982f29cc497812d9f22f7]
Former-commit-id: cf8cd9d051
 2015-03-27 15:07:28 -04:00
Dave Hladky
abfe39a9f8 Omaha #4260 Added default Model 
Former-commit-id: 14a05b15c6 [formerly 86b1776063d04edb6133f57fabdaf04840880774]
Former-commit-id: 8e984dc155
 2015-03-27 13:44:17 -05:00
Sean.Webb
0bfb84273c Merge "ASM #17221 - Updated LDM to 6.12.9" into asm_14.4.1 
Former-commit-id: 6679bc9519 [formerly ec7696a5ca44ccdebf86888d27e3fcb151576a61]
Former-commit-id: d93c0ec88c
 2015-03-27 08:06:00 -05:00
Sean.Webb
35b2495144 ASM #17221 - Updated LDM to 6.12.9 
Change-Id: Ib01372e3d0365404c9c8c94b951536d671ec5319

Former-commit-id: 723febe25e [formerly 3fb2bed462ec0cb2f985b80a4ea02192eac917db]
Former-commit-id: 022b59e739
 2015-03-27 07:58:40 -04:00
Ron Anderson
62c1357635 Omaha #4027 Convert all GFE text products to mixed case 
Change-Id: I94275b65e8733d5bed1242f78503f1613b2e0aff

Former-commit-id: ea0b02bedd [formerly 07088e71d78d6302da23683894d96d72e4f69a96]
Former-commit-id: e6cfc5f40d
 2015-03-26 18:30:39 -05:00
Steve Harris
d3df16945d Merge "Omaha #4337 - merge modification of logback.xml" into omaha_15.1.1 
Former-commit-id: f961e64ca4 [formerly 556a47e626b3b90b46ece02451c580d95734377a]
Former-commit-id: f73567ec1f
 2015-03-26 16:02:10 -05:00
Steve Harris
e812613c42 Omaha #4337 - merge modification of logback.xml 
Former-commit-id: 9f26e02dc6 [formerly 8f555a33c557fabce3c9035bdd91c8627362cf50]
Former-commit-id: 6486a684a2
 2015-03-26 15:56:04 -05:00
Matthew Howard
65b56f0114 Merge "ASM #17144 - GFE: Add Capabilities for CONUS Real-Time Mesoscale Analysis at 2.5km" into asm_15.1.1 
Former-commit-id: 3b1fb9367b [formerly 6ade9593a6d691196f0092398e88eacb00ae342e]
Former-commit-id: 9318a680cf
 2015-03-26 13:05:33 -05:00
Bruce.Hundermark
abdd5d8e1f ASM #17144 - GFE: Add Capabilities for CONUS Real-Time Mesoscale Analysis at 2.5km 
Change-Id: I7074e60477da457820615d67b84394afb2cc5d5e

Former-commit-id: 0e155b267e [formerly d8f747df842ba808a8df09392ff60071b0d3e987]
Former-commit-id: 0a6a2f8cd9
 2015-03-26 16:04:33 +00:00
Nate Jensen
8221c248ea Merge "Omaha #4319 Save volume scan number" into omaha_15.1.1 
Former-commit-id: 146a4e91f1 [formerly 21c3e07d51bab18272d24cef6baf1dcf615ace69]
Former-commit-id: 8294179024
 2015-03-26 10:57:34 -05:00
Steve Harris
663bf8c2f9 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: 165971a4f6 [formerly 0db97a3cefc6f709d336883202e51f1d5255ad75]
Former-commit-id: 25bd3ee930
 2015-03-26 09:57:17 -05:00
Melissa Porricel
152bdd241d ASM #16905 - Implement missing RTMA/URMA parameters 
Change-Id: I4ec616b80b6c8f85bafec46f0c840c3c43a9c527

Former-commit-id: 9a2a726fb9 [formerly d68078b665787d91bfd92440345d41f9fcc98b3d]
Former-commit-id: d96bbe4799
 2015-03-26 09:58:45 -04:00
Steve Harris
d320c52c35 Merge tag 'OB_14.4.1-20m' into omaha_14.4.1 
14.4.1-20m


Former-commit-id: f099adad75 [formerly dc7c935e809764604aa7f773b7123630dd818dd5]
Former-commit-id: 68f4b3c18f
 2015-03-26 08:26:55 -05:00
Ben Steffensmeier
a481bada83 Omaha #4319 Save volume scan number 
Former-commit-id: e6a8f3e6a0 [formerly 76cf847f8c8d7248f99db13ac59f34d1186e01e6]
Former-commit-id: e1a3e0023e
 2015-03-25 18:05:00 -05:00
Ron Anderson
29b042d842 Merge "Omaha #4313 Updated Service Backup html help files for Multi-Site capability" into omaha_15.1.1 
Former-commit-id: 0c3f6a11e8 [formerly 1b268788a9fbec5b3ec557395c7122e8e2437a35]
Former-commit-id: 597c396e06
 2015-03-25 16:45:35 -05:00
Nate Jensen
adc8ad2557 Omaha #3299 delta script improvements 
improvements based on discussions with Sean Webb

Change-Id: I5726a4c43b2b860f9fbc9e173cca5907d0a69c74

Former-commit-id: 10e7afd1e8 [formerly c57b4988b97327c1efa52383644913319eb0df74]
Former-commit-id: a3ad795bbf
 2015-03-25 14:49:00 -05:00
Ron Anderson
f435bea9a6 Merge "Omaha #4330 Changed feature order so nwsauth is installed before gfe on the Windows build." into omaha_15.1.1 
Former-commit-id: 76f8fd2cfe [formerly fc7526665ab854440eced0b03075fabc32f342df]
Former-commit-id: 9208af09dc
 2015-03-25 11:15:32 -05:00
Ron Anderson
020ad9a4e0 Omaha #4313 Updated Service Backup html help files for Multi-Site capability 
Change-Id: I5d456a87ea651e377366c3826edacc29cfe38d5f

Former-commit-id: ade9cbdf61 [formerly 2fb059379d95abe1762cde7258dd722319fc0165]
Former-commit-id: 1e82efdb12
 2015-03-25 10:53:36 -05:00
Ron Anderson
3492f31889 Omaha #4300 Minor updates to the Service Backup Dialogs 
Change-Id: I409be11a06ff181f184d22dea311c6b0a7e96cca

Former-commit-id: fdfd52e26c [formerly 6833a9db5bc8c0187ce999d8a7f310bcd4892ad2]
Former-commit-id: 7aa3d76477
 2015-03-25 10:46:36 -05:00
David Lovely
84722234cf Omaha #4330 Changed feature order so nwsauth is installed before gfe on the Windows build. 
Former-commit-id: d21e1da9c0 [formerly 542a81d065c7ea5a991965967bf78faae253a029]
Former-commit-id: c975476243
 2015-03-25 09:06:45 -05:00
Ron Anderson
120bd15d63 Merge "Omaha #4300 Client-side changes for multi-site service backup" into omaha_15.1.1 
Former-commit-id: 863082515f [formerly f6a14fd5ffa9a3629aae5a2d9a360b75bca31878]
Former-commit-id: 3fa5db60e5
 2015-03-23 17:33:08 -05:00