Ben Steffensmeier
c6295db321
Omaha #4399 Update viirs to handle NCC.
...
Former-commit-id: ccc2036b1671cecc74a8d74b2b916c2ba1ddcb83
2015-04-15 10:54:17 -05:00
David Gillingham
5d208bb120
Omaha #4383 : Fix ReferenceMgr to work in multi-domain setups.
...
Change-Id: I5ee8810949c014a936dd01293d14c003445e18a8
Former-commit-id: b49ec6d3f2b714904db0ba0aeecd1c8d32b0f708
2015-04-14 12:33:43 -05:00
Steve Harris
7ec7cdf232
Merge tag 'OB_15.1.1-4' into omaha_16.1.1
...
15.1.1-4
Former-commit-id: c9f9bc2c612dae6d355fb3c5de313aa7274adc8b
2015-04-13 12:22:22 -05:00
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
Fay.Liang
6cd66bff93
Merge tag 'OB_14.4.1-25' into master_15.1.1
...
This merge includes all changes in 14.4.1-22, -23, -24, and -25
Conflicts:
cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/FileTreeView.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.common.dataplugin.text/utility/common_static/base/mixedCase/mixedCaseProductIds.txt
Former-commit-id: 857d0d89ae214ccf53713f74ef6778ba80c637fe
2015-04-13 13:02:24 -04:00
Matthew Foster
c3793908cf
VLab Issue #7570 - Remove duplicate derived parameter definitions from dataplugin.grid project; fixes #7570
...
Change-Id: Id1849c0482b3b170c7fe0a247146b239e6c84cf2
Former-commit-id: be185a7b314348400b9b275eff4d8550ae0e6b91
2015-04-13 13:08:51 +00:00
Fay.Liang
88d6e796f5
Merge tag 'OB_14.3.3-5' into master_14.4.1
...
Merges 14.3.3-3, 14.3.3-4, and 14.3.3-5
Former-commit-id: 66eb429aee1d602cf216f1509e780afdbd1cbd23
2015-04-10 13:49:22 -04:00
Shawn.Hooper
4cf9697067
ASM #17222 - Redbook – SPC 4-8 Day Convective Outlook products display on menu but do not update in redbookFcstMap.xml"
...
Change-Id: Iac21d5f7a3595f95058a05d2c9c9f5b5a77170be
Former-commit-id: d76e74e667e7847a57c9100cc4007dfc6d22ba06
2015-04-10 13:20:35 -04:00
Fay.Liang
6a9a1daef6
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: a9ee3ef4fb625850df26a5a9e9f83e1c24f892d9
2015-04-10 12:13:31 -04: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
David Gillingham
1d2fb3c135
Omaha #4385 : add nwpsCG1 model to Volume Browser.
...
Change-Id: Id069d07c5dfffaf1952042611f35a2221d8d639b
Former-commit-id: 20d76ae4ed226d19ea6ddbb408224ace8519787b
2015-04-09 15:13:48 -05:00
Matthew Foster
8d56aabf36
VLab Issue #6688 - Baumgardt VB Modifications - Deleted numerous unused files. Added DGEX and HiResW models back to baseFamilies.xml; fixes #6688
...
Change-Id: Iea8f52d8ba1cf78848dc95bf0792f0f220d4dd08
Former-commit-id: 382e01a6b5b93697efa2016a21cc2cdd1ececc5f
2015-04-09 13:53:58 -05:00
David Gillingham
c01694607f
Omaha #4384 : Create Wave and Period derived parameters for nwpsTrkngCG0 model, add them to Volume Browser.
...
Change-Id: I17ebbd913a17e158898a27b83e342f08ade610d6
Former-commit-id: 09d7c45466f2fad8df8142bcbf0ded2e3757ffcb
2015-04-09 13:26:52 -05:00
Ana Rivera
388e4a3d8c
Merge branch 'master_15.1.1'(master_15.1.1-2m) into field_15.1.1
...
Change-Id: If8fdc78136ac00065a7c1f9a3b45e814a58c815e
Former-commit-id: 87043a26d3e1aa32f693ff0f48d4357ac416e6d9
2015-04-09 15:13:54 +00:00
Fay.Liang
8b31206de4
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: ff79e4fdaf62c76f39b0e1948d33e0b84df77011
2015-04-09 10:18:40 -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
Fay.Liang
c681804958
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 690e16f2101481202c67622cc745079465261ae9
2015-04-06 15:42:01 -04:00
Fay.Liang
618781f10c
Merge tag 'OB_14.3.3-2' into master_14.4.1
...
14.3.3-2
Conflicts:
cave/com.raytheon.uf.viz.spellchecker/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java
Former-commit-id: f5fad51061f568aea4ea581a099ef8353758add6
2015-04-06 15:40:31 -04:00
Steve Harris
19be21406f
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Former-commit-id: 2333d5fa9277d727aae1136df25eda1bf316393a
2015-04-06 11:11:59 -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
Ron Anderson
b191e48681
Merge "Omaha #4367 : Revert baseline time constraints for WindGust back to 1 hr." into omaha_14.4.1
...
Former-commit-id: bc410201332feaced47f12645528fcb36c09adc6
2015-04-06 09:39:38 -05:00
David Gillingham
9db7098bb2
Omaha #4366 : Fix gfecron user id check in runManualNWPS_OutsideAWIPS.sh.
...
Change-Id: I1738406430766fa01de31a40f8e66b0633ace74f
Former-commit-id: 3ee51663579734163b54b4997e8a3cb3e0727025
2015-04-03 12:06:00 -05:00
David Gillingham
2f5d67f093
Omaha #4367 : Revert baseline time constraints for WindGust back to 1 hr.
...
Change-Id: I8ed3b075b4097d37926d67c616a451fee38b4358
Former-commit-id: b6660c446ee92a6bf82b935920ee1c6def7f7699
2015-04-03 12:00:45 -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
David Gillingham
5fddbf8ffe
Omaha #4353 : Remove log spam on Geometry validation errors.
...
Change-Id: I58f3c535e3fe582ea7402ad38d42a815823c099e
Former-commit-id: a8d6144ac52316c4e97c030c6b81cab20bbf7647
2015-04-02 16:34:22 -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
Richard Peter
99dd31ce70
Merge "Omaha #3722 - Update taf datauri fields to not be null in db." into omaha_14.4.1
...
Former-commit-id: e9b25a22497335c1580980c106156cf5779a4fe3
2015-04-02 13:42:22 -05:00
Richard Peter
4cd1e48fc9
Omaha #3722 - Update taf datauri fields to not be null in db.
...
Change-Id: I47aef4a6775e91a0d3b749252cf3726e38d6308e
Former-commit-id: 073e73dd86aee3c6d1731def225aad038cf877de
2015-04-02 13:41:00 -05:00
Fay.Liang
60fd384f94
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
e7f9f2aef8
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
Steve Harris
f7af8ee606
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Former-commit-id: cf70a7888a39667c54b344274c76d5106927fa30
2015-04-01 17:22:45 -05:00
Ron Anderson
588bc104a3
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
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
Fay.Liang
08b89e7978
Merge branch 'master_14.4.1' into asm_14.4.1
...
Former-commit-id: 4a76f9bb72ade29ca23a158c0cb2ef038905fd07
2015-03-31 15:02:33 -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
Ana Rivera
9172a3bdd4
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
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
