Commit graph

8118 commits

Author SHA1 Message Date
Fay.Liang
6865b55584 Merge branch 'master_14.4.1' into asm_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 0cff7c362f [formerly bc522178d8 [formerly bce50b8501f52597f5dc66b767a3c9fd241fe256]]
Former-commit-id: bc522178d8
Former-commit-id: 6c900c9924
2015-04-17 16:59:06 -04:00
Fay.Liang
197a0d9316 Merge branch 'asm_14.4.1' of ssh://10.201.30.8: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: 6dd4acc2c2 [formerly 5606e3cfa0 [formerly 03e663afae6eb0998892e2921566652f42196e1f]]
Former-commit-id: 5606e3cfa0
Former-commit-id: f28633c1d4
2015-04-16 23:06:25 -04:00
Matthew Howard
164ad3a0e0 Merge "ASM #14946 - fix issue when timezone is not defined for any zone in a segment" into asm_14.4.1
Former-commit-id: 81ea5a602b [formerly 5c4201ae96 [formerly 7d41bdc55457e17c47bfdf84468683bd8d5c416a]]
Former-commit-id: 5c4201ae96
Former-commit-id: 9cd873b501
2015-04-16 12:54:41 -05:00
Rici.Yu
ac9c9f5aa9 ASM #14946 - fix issue when timezone is not defined for any zone in a segment
Change-Id: I252f78cb9f5bf1cf556788c79fe14ad338b546aa

Former-commit-id: 03034f57c8 [formerly 3b59050996 [formerly ef4c5307d5693abd834f4210e081fb8e3a21f90b]]
Former-commit-id: 3b59050996
Former-commit-id: 524fa004d3
2015-04-16 13:24:29 -04:00
Yun.Teng
aca33216b6 ASM #17383 - Fixed error that time constraint being off
Change-Id: I7b00a4b0d1bd7822cd3f751264badfa62afc3bcb

Former-commit-id: dd5fd66fa5 [formerly 11cb7cd526 [formerly d0e8d057f765d95c65ef121e784152d05bd1187c]]
Former-commit-id: 11cb7cd526
Former-commit-id: ea15319947
2015-04-16 17:57:45 +01:00
Rici.Yu
8fee3a32f7 ASM #17390 - Fix string/int conversion issue preventing BOIVerify from launching
Change-Id: I6c0a0ea22650a5b42b24b41e41e3ca0acabbf14b

Former-commit-id: c9337caeb2 [formerly c9955bce55 [formerly c6888b4aa86ed3425b5a016d2fbe5664763b4682]]
Former-commit-id: c9955bce55
Former-commit-id: c1511407bc
2015-04-16 10:51:23 -04:00
David Lovely
118bca680a Omaha #4392 Updates to configure new QPID json file.
Former-commit-id: 9f488920a1 [formerly 531944303c [formerly ef2c2f94c7dc30fb0313ce8df295c52ea3c22e85]]
Former-commit-id: 531944303c
Former-commit-id: f2e5ab25dc
2015-04-16 09:03:21 -05:00
Steve Harris
1ee9770467 Omaha #3299 - Added ldm-6.12.9 to open source credits
Former-commit-id: b0faa6d57f [formerly 89693bc797 [formerly 2555771c8694cdcbe208362538444ec514e5d518]]
Former-commit-id: 89693bc797
Former-commit-id: 3a4731daff
2015-04-15 09:15:11 -05:00
Greg Armendariz
afda0eabb9 Merge "Omaha #4382 Removed use of reg.exe" into omaha_14.4.1
Former-commit-id: d0711fbd8b [formerly 5a63e4d605 [formerly 5efaa466dde39e9ac7d29a7a8a1ed3825774bd9d]]
Former-commit-id: 5a63e4d605
Former-commit-id: a961e1edbb
2015-04-13 09:27:26 -05:00
Steve Harris
520ca14c21 Merge tag 'OB_14.4.1-24' into omaha_14.4.1
14.4.4-24


Former-commit-id: b78afa0e72 [formerly 50ea025340 [formerly 11b32bb99084a6162cd0d463800281c7115aef85]]
Former-commit-id: 50ea025340
Former-commit-id: 7592f02576
2015-04-13 08:56:12 -05:00
David Lovely
5180fac258 Omaha #4382 Removed use of reg.exe
Former-commit-id: 3254d34c04 [formerly 1d00661a47 [formerly 7138fb04f19bd48cdcd23785f524a52db0e8fdd6]]
Former-commit-id: 1d00661a47
Former-commit-id: a7802e271c
2015-04-13 07:44:16 -05:00
Fay.Liang
a2193b5b4b 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: 88d6e796f5 [formerly 0a5f18487a [formerly 66eb429aee1d602cf216f1509e780afdbd1cbd23]]
Former-commit-id: 0a5f18487a
Former-commit-id: 266161bf86
2015-04-10 13:49:22 -04:00
Shawn.Hooper
2d831c871e 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: 4cf9697067 [formerly b11c4a3d9e [formerly d76e74e667e7847a57c9100cc4007dfc6d22ba06]]
Former-commit-id: b11c4a3d9e
Former-commit-id: b96813c962
2015-04-10 13:20:35 -04:00
Fay.Liang
abe7660994 Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 6a9a1daef6 [formerly a4a2421296 [formerly a9ee3ef4fb625850df26a5a9e9f83e1c24f892d9]]
Former-commit-id: a4a2421296
Former-commit-id: 3898abb1db
2015-04-10 12:13:31 -04:00
Fay.Liang
3cdf97b865 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 9a6d44aec1 [formerly e7af381368 [formerly c83d031df8ff4087dc62c66026de39220f439dc9]]
Former-commit-id: e7af381368
Former-commit-id: cbc1e434b0
2015-04-10 12:06:08 -04:00
Juliya Dynina
2f5676c2a0 Merge "ASM #17215 - CAVE can lockup when volume browser is loaded but no element is selected" into asm_14.4.1
Former-commit-id: b9a8b432ba [formerly e7b4b76e27 [formerly 0fc80ad597575a3c43402a347c3260e6ad44e963]]
Former-commit-id: e7b4b76e27
Former-commit-id: 41a494c735
2015-04-10 08:46:57 -05:00
David Gillingham
c454610ff7 Omaha #4385: add nwpsCG1 model to Volume Browser.
Change-Id: Id069d07c5dfffaf1952042611f35a2221d8d639b

Former-commit-id: 1d2fb3c135 [formerly 3594451824 [formerly 20d76ae4ed226d19ea6ddbb408224ace8519787b]]
Former-commit-id: 3594451824
Former-commit-id: acb5b4f1af
2015-04-09 15:13:48 -05:00
Ron Anderson
d8aa339e56 Merge "Omaha #4384: Create Wave and Period derived parameters for nwpsTrkngCG0 model, add them to Volume Browser." into omaha_14.4.1
Former-commit-id: 404782166f [formerly 784f7b9433 [formerly 73f7967f208ba6d9ff40866e6c7b585411bf5385]]
Former-commit-id: 784f7b9433
Former-commit-id: e7338f2ddd
2015-04-09 15:11:44 -05:00
David Gillingham
7fe1a980ba Omaha #4384: Create Wave and Period derived parameters for nwpsTrkngCG0 model, add them to Volume Browser.
Change-Id: I17ebbd913a17e158898a27b83e342f08ade610d6

Former-commit-id: c01694607f [formerly b13f8c7794 [formerly 09d7c45466f2fad8df8142bcbf0ded2e3757ffcb]]
Former-commit-id: b13f8c7794
Former-commit-id: 2e3b98f02f
2015-04-09 13:26:52 -05:00
Steve Harris
97d7a35bd9 Merge "Omaha #3299 - Master rights and foss for 14.4.1" into omaha_14.4.1
Former-commit-id: 7c48ede73e [formerly f25960c030 [formerly 3e684fe9f4275979c4145994d58fc8113e750846]]
Former-commit-id: f25960c030
Former-commit-id: dbd0196848
2015-04-09 12:11:12 -05:00
Brian Clements
acbf97a041 Omaha #4386 lightning resource updates frames asynchronously
Change-Id: If0b43cb4d53e16d7cec4b4193da8437338957379

Former-commit-id: cbe0a699fb [formerly cbb6c52f8c [formerly 9c82bcc5c93dcd30e3c645f673611ac6710c8fab]]
Former-commit-id: cbb6c52f8c
Former-commit-id: feb9518f03
2015-04-09 10:25:28 -05:00
Steve Harris
065c1e8155 Omaha #3299 - Master rights and foss for 14.4.1
Former-commit-id: 6aa72398d2 [formerly 1d281377d5 [formerly e9c9daec3e77c8f9af54afb06318f0dce9958b50]]
Former-commit-id: 1d281377d5
Former-commit-id: 42d321d3c8
2015-04-09 10:22:32 -05:00
Fay.Liang
d4e5cd10ad Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 3462cc40ea [formerly 696b8e4e88 [formerly 2f43c804ce6113b74ea72857fea0c6694ad626fe]]
Former-commit-id: 696b8e4e88
Former-commit-id: 1a6f3f0dbc
2015-04-09 10:43:35 -04:00
Fay.Liang
484b1c8650 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: 8b31206de4 [formerly 1561ee6439 [formerly ff79e4fdaf62c76f39b0e1948d33e0b84df77011]]
Former-commit-id: 1561ee6439
Former-commit-id: d4abbbdb37
2015-04-09 10:18:40 -04:00
Fay.Liang
ab37a5c8a3 Merge branch 'field_14.3.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.3
Conflicts:
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 2301da818a [formerly c1d84bf3b0 [formerly fea365e547f12a13a942594f8267b15a7895a102]]
Former-commit-id: c1d84bf3b0
Former-commit-id: 43adcc2ea3
2015-04-07 15:38:18 -04:00
Zhidong.Hao
0319992a49 ASM #17332 AvnFPS: Error message is displayed when cancel the TAF from 'Restore From....' option
Change-Id: I9ae9bf9b725db77e025b1b1bb508ddcc163a6c06

Former-commit-id: f44e6c7deb [formerly 64044b1320 [formerly d7d664dce1959257676755bb0632e904c05593a6]]
Former-commit-id: 64044b1320
Former-commit-id: aec5351938
2015-04-07 14:37:56 -04:00
Ana Rivera
5f6d3ed622 VLab Issue #7489 - Fix SFPA42 data_store entry in pqact.conf;fixes #7489
Change-Id: Id7675169dc22035ea9640fdf07351f8667638dd6

Former-commit-id: 53807298e8 [formerly b5150e3d43 [formerly 2b2b0b0387932888eaa6c8e5b86fc05d7254de3a]]
Former-commit-id: b5150e3d43
Former-commit-id: f486274e5d
2015-04-07 18:33:14 +00:00
Fay.Liang
8004ba3123 Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: c681804958 [formerly 49108ab5f1 [formerly 690e16f2101481202c67622cc745079465261ae9]]
Former-commit-id: 49108ab5f1
Former-commit-id: fbf1ab4e11
2015-04-06 15:42:01 -04:00
Fay.Liang
36f4f953cb 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: 618781f10c [formerly c8962caee7 [formerly f5fad51061f568aea4ea581a099ef8353758add6]]
Former-commit-id: c8962caee7
Former-commit-id: 8f3b4cb35a
2015-04-06 15:40:31 -04:00
David Friedman
587482c3aa ASM #17215 - CAVE can lockup when volume browser is loaded but no element is selected
Change-Id: Ia672d2a4f5e38dcd3b1c43373993779557e86309

Former-commit-id: 97c938cb25 [formerly f8db9d993e [formerly 87ceca157b69dd6301f2ee0d6d9cee9aa7bb8bc8]]
Former-commit-id: f8db9d993e
Former-commit-id: f5db6cee9a
2015-04-06 19:38:33 +00:00
Ron Anderson
4c18b347c3 Merge "Omaha #4367: Revert baseline time constraints for WindGust back to 1 hr." into omaha_14.4.1
Former-commit-id: b191e48681 [formerly 7ec6496a0c [formerly bc410201332feaced47f12645528fcb36c09adc6]]
Former-commit-id: 7ec6496a0c
Former-commit-id: be4eba46a3
2015-04-06 09:39:38 -05:00
David Gillingham
3a619c1753 Omaha #4366: Fix gfecron user id check in runManualNWPS_OutsideAWIPS.sh.
Change-Id: I1738406430766fa01de31a40f8e66b0633ace74f

Former-commit-id: 9db7098bb2 [formerly af9ed691fc [formerly 3ee51663579734163b54b4997e8a3cb3e0727025]]
Former-commit-id: af9ed691fc
Former-commit-id: 58f8256708
2015-04-03 12:06:00 -05:00
David Gillingham
d29e51e8e4 Omaha #4367: Revert baseline time constraints for WindGust back to 1 hr.
Change-Id: I8ed3b075b4097d37926d67c616a451fee38b4358

Former-commit-id: 2f5d67f093 [formerly ccfda63e1d [formerly b6660c446ee92a6bf82b935920ee1c6def7f7699]]
Former-commit-id: ccfda63e1d
Former-commit-id: 6c6d9f5a3e
2015-04-03 12:00:45 -05:00
Fay.Liang
9fabaaa994 Merge branch 'omaha_14.3.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.3
Former-commit-id: 368369872b [formerly 410d623afa [formerly 39be5eb857ab247a1116a145aee274d25e993368]]
Former-commit-id: 410d623afa
Former-commit-id: 93b7751887
2015-04-02 14:51:06 -04:00
Richard Peter
13ce71adb1 Merge "Omaha #3722 - Update taf datauri fields to not be null in db." into omaha_14.4.1
Former-commit-id: 99dd31ce70 [formerly 0ef1e980bd [formerly e9b25a22497335c1580980c106156cf5779a4fe3]]
Former-commit-id: 0ef1e980bd
Former-commit-id: cdf85b8346
2015-04-02 13:42:22 -05:00
Richard Peter
5641be4136 Omaha #3722 - Update taf datauri fields to not be null in db.
Change-Id: I47aef4a6775e91a0d3b749252cf3726e38d6308e

Former-commit-id: 4cd1e48fc9 [formerly f8425ab814 [formerly 073e73dd86aee3c6d1731def225aad038cf877de]]
Former-commit-id: f8425ab814
Former-commit-id: f036b4db56
2015-04-02 13:41:00 -05:00
Fay.Liang
16d64528c5 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 60fd384f94 [formerly c174a5ff27 [formerly a8eb3c2346609e0ca351c494c5bdfa2090423019]]
Former-commit-id: c174a5ff27
Former-commit-id: d7c0354880
2015-04-02 11:33:37 -04:00
Fay.Liang
5a16c3ee92 Merge branch 'emc_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: e7f9f2aef8 [formerly bd4ad0a5c3 [formerly 4097a0a5dff82ca332d88aac01dc67c26c4a45d4]]
Former-commit-id: bd4ad0a5c3
Former-commit-id: 95f4831f0b
2015-04-02 11:31:31 -04:00
Rici.Yu
df0b9d2d0c ASM #17194 - convert SerpConfig.py from smart tool to utility
Change-Id: I8007ca1676de148aa42c5b15c8e3366bbe8c8e5d

Former-commit-id: 0492e66d87 [formerly d47caf2552 [formerly 6968986c535bbadee8436cca5cfcc329d47c606b]]
Former-commit-id: d47caf2552
Former-commit-id: 466b38d20d
2015-04-02 10:48:25 -04:00
Ron Anderson
dd07ff174c Omaha #4288 Fixed widget is dispose error in FileTreeView
Change-Id: I38b8af21ee8a6ce22bd67eee1abb8e51dc7fb1b9

Former-commit-id: 240027df68 [formerly 0ddda332a3 [formerly 8791485de7c0885f33d03ed67cf0352406caf1a6]]
Former-commit-id: 0ddda332a3
Former-commit-id: cf01d266f1
2015-04-02 09:26:13 -05:00
Ron Anderson
d1bdf50fdd Omaha #4357 Comment out all product IDs by default they will be enabled at a later date.
Change-Id: I4e4683e0d5468e77b67ceee4de859129cfca0bec

Former-commit-id: 588bc104a3 [formerly c4b4343573 [formerly 760b479895474dbd237f9b6d72913cfc4d937b90]]
Former-commit-id: c4b4343573
Former-commit-id: 30a81243f0
2015-04-01 16:55:05 -05:00
David Gillingham
a7ac773da2 Issue #4344: Update build.properties for spellchecker plugin to include plugin.xml.
Change-Id: I1a9009ed0d165ed48c81dfd088bf6652ae68110e

Former-commit-id: bfbad2a22d [formerly a43bd0cb97 [formerly e4860cdd30d96bf7fc4347a3c92712e5350adf25]]
Former-commit-id: a43bd0cb97
Former-commit-id: c87fed86ae
2015-04-01 15:43:42 -05:00
Fay.Liang
5e1c980eba Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: 08b89e7978 [formerly 5ad29ee888 [formerly 4a76f9bb72ade29ca23a158c0cb2ef038905fd07]]
Former-commit-id: 5ad29ee888
Former-commit-id: adf70ee1c5
2015-03-31 15:02:33 -04:00
Ana Rivera
7fcd856455 VLab Issue #7280 - NWPS:Add missing smartinit file (nwpsTrkngCG0.py) and remove extra parenthesis in nwpsCG1.py
Change-Id: I4dd0e31e936720c07b40a905017958d3f4def649

Former-commit-id: 9172a3bdd4 [formerly 628d228957 [formerly e3b0aef8afd48c54a3d947e5bbbe67c238f1fdd2]]
Former-commit-id: 628d228957
Former-commit-id: fa72c10a98
2015-03-30 20:51:57 +00:00
David Gillingham
85c47683ed Issue #4344: Make suggestion blacklist for spellchecker configurable via localization.
Change-Id: I1e73afcc2433329bb6b3c3200d776711dc1d7600

Former-commit-id: 2e460f4700 [formerly 19043b866a [formerly 44e092d35e214c8f11fedb1c4aee0f78e4f82acc]]
Former-commit-id: 19043b866a
Former-commit-id: e8e958c416
2015-03-30 11:57:33 -05:00
Yun.Teng
4726f0dde4 ASM #17206 - Change some parametes that are not rate parameters
Change-Id: I8420e3d3b85e32420c5c91b802f7cdccc035bc2f

Former-commit-id: db554cf9ce [formerly e40e907797 [formerly 23927a6c91076fedc6d53eb5ba2882166814134a]]
Former-commit-id: e40e907797
Former-commit-id: 58e4a5df28
2015-03-30 16:39:34 +01:00
Fay.Liang
f81dd89c07 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 e7d2d5e901 [formerly f8b4d9d81247c6089960c83b57417a5ba62cdfc2]]
Former-commit-id: e7d2d5e901
Former-commit-id: 8383682425
2015-03-27 15:16:09 -04:00
Fay.Liang
ccee75c432 Merge branch 'omaha_14.4.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: fed293e459 [formerly 869fd74e46 [formerly 61ce9a778c934223e30012c15000bf82f9a19ffe]]
Former-commit-id: 869fd74e46
Former-commit-id: a2797cdcb5
2015-03-27 15:11:09 -04:00
Fay.Liang
6f334984cb 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 cf8cd9d051 [formerly a91ad7ff32c153c34d6982f29cc497812d9f22f7]]
Former-commit-id: cf8cd9d051
Former-commit-id: cc7a2e7082
2015-03-27 15:07:28 -04:00
Sean.Webb
4a54cf9006 Merge "ASM #17221 - Updated LDM to 6.12.9" into asm_14.4.1
Former-commit-id: 6679bc9519 [formerly d93c0ec88c [formerly ec7696a5ca44ccdebf86888d27e3fcb151576a61]]
Former-commit-id: d93c0ec88c
Former-commit-id: 0bfb84273c
2015-03-27 08:06:00 -05:00