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
Richard Peter
8a34413ff9
Merge "Omaha #4260 Added default model change script Change-Id: Ibbae932e4832c16aeeb99790edd855a0ad775e84" into omaha_15.1.1
...
Former-commit-id: 4bc75c79b39545619f82e48203fc133a9303610f
2015-04-13 11:18:57 -05:00
Dave Hladky
d8e8abe20a
Omaha #4260 Added default model change script
...
Change-Id: Ibbae932e4832c16aeeb99790edd855a0ad775e84
Former-commit-id: 8fc0b9594a280d4b9b691df40de295e261fb5b24
2015-04-13 08:15:57 -05:00
Richard Peter
d0de1f9b2b
Merge "Omaha #4346 Merge base xml files into base configuration." into omaha_15.1.1
...
Former-commit-id: e95253fdedf7aa684e482bceed35f8c9cfa29891
2015-04-10 12:47:37 -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
Roger Ferrel
e5d09b40ec
Omaha #4346 Merge base xml files into base configuration.
...
Change-Id: I056a4e04cb20625408a7a3e117e0cb0babad4a0d
Former-commit-id: ed292bad0ffffd57fecae3e8d80f125fd948f903
2015-04-09 07:58:33 -05:00
Fay.Liang
5accdbf2e7
Merge branch 'field_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
...
Former-commit-id: 3c4a22bf33c9f1147c6ebb263e6102294b33f65f
2015-04-08 12:27:57 -04:00
Fay.Liang
69587e6392
Merge branch 'ohd_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
...
Former-commit-id: d7c9aeecd43125529303f37560b9ae76b2934817
2015-04-08 12:26:50 -04: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
Chip Gobs
5377c9db38
Merge remote branch 'remotes/origin/ohd_15.1.1' into ohd_15.1.1
...
Former-commit-id: 2438b5702f8fdcd52d79dce64613b8b394d32b16
2015-04-07 15:07:44 -04:00
Nate Jensen
78cc9fd16c
Omaha #4204 keep renamed parts on 4 panel action
...
Change-Id: I76dcfa52bc79bd9274c11912e889728486d3ca4f
Former-commit-id: 12207dc69597a229ca732b7dc90e2d75ebbc988b
2015-04-07 11:15:13 -05:00
Greg Armendariz
4623588cc5
Omaha #4330 - Fix developer build
...
Change-Id: Ic818ca89f44049a3d31583d0499d9e0756673eb2
Former-commit-id: d205922ba432e4f4b3c411ea798ee68c1563cd66
2015-04-06 10:47:23 -05:00
Kiran.Shrestha
8f981c5fa4
ASM #15025 WRK product changes header to alternate- long-line pil in header block.
...
Change-Id: If5776bbddbf8b5eddf8dff85d913ce8a4862bd12
Former-commit-id: 3ab4df17a7fd40f93de6cb32798ee5a2385f4814
2015-04-03 18:43:24 +00: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
Nate Jensen
df12c0d2a6
Merge "Omaha #4198 Add User Permissions for editting Hazard Services settings" into omaha_15.1.1
...
Former-commit-id: 3f0ab9760b2779fdb4a3557348acfa3547f30e08
2015-04-02 13:33:16 -05:00
Nate Jensen
18f76ae519
Omaha #4204 retain part names when 4-panel swapped
...
Change-Id: I86b364dfe879100fa81991ab31c0e8e1122d3862
Former-commit-id: b9c5c03f403d00b7fbf0ff5d9c8ed34c82556abd
2015-04-02 12:06:10 -05:00
Ron Anderson
1dddf3262f
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
ad10e23f2a
Omaha #4198 Add User Permissions for editting Hazard Services settings
...
Former-commit-id: db304c599bdaa54280d9be0a859f840175ff0601
2015-04-01 15:46:10 -05:00
Fay.Liang
499a7c7e80
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
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
Jingtao Deng
47e6761918
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
6442ecb0b5
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
934355efc8
ASM #17144 - Revert "ASM #17144 - GFE: Add Capabilities for CONUS Real-Time Mesoscale Analysis at 2.5km"
...
This reverts commit 0e155b267e
2015-04-01 13:23:24 -04: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
Greg Armendariz
1387d6117e
Omaha #4103 - Remove svcbu.properties from RPM package list
...
Former-commit-id: d2af97d5e158148cdaafb2c619b4f393e99d4483
2015-04-01 11:12:04 -05: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
David Gillingham
afc6b45fa0
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
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
Richard Peter
909aba7276
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
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
Ben Steffensmeier
888da5052c
Omaha #4319 Set default volumescannumber in upgrade script.
...
Former-commit-id: 63c6cf4c36b27bd0c9b5c5dd31c4dd463b5c3343
2015-03-31 10:33:12 -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
dd7c47b911
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
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
Ana Rivera
3791f15203
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
216de7743b
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
6679bc9519
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
