Commit graph

6361 commits

Author SHA1 Message Date
Brian.Dyke
418894a17b Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: f0f79fb324665245ef759947d24514a6c8bc4470
2014-10-16 12:04:27 -04:00
Sean.Webb
36d39be5fd ASM #16827 - Added 6th channel configuration, and change logrotate to handle goes_add.log
Change-Id: I2012ac01d51ed11c077d06b638ede4b990bce5cd

Former-commit-id: c11e78b57bca7d242d4d8c29dc51669d7aebb37d
2014-10-16 10:38:14 -05:00
Shawn.Hooper
eafaf01966 ASM #13467 - Fix for GFE: Need to add Beach Hazards Statement
Change-Id: I9d19a76afff8e4c36db20aec15b997eefc260209

Former-commit-id: 366c7c478c6d83f8d21e3b30cc664a32cabf08bd
2014-10-16 11:30:29 -04:00
Brian.Dyke
c60124fa61 Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: ea0a81b12c7b1a0154361d97882ef65fc55b20e1
2014-10-16 11:21:39 -04:00
Brian.Dyke
86a76b3fe6 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 53bfd53b6fea22c354fa6ca501ebfb3ff937f4f2
2014-10-16 11:20:36 -04:00
Ana Rivera
f516cc441d VLab Issue #5014; Workaround pqact pattern for ESTOFS (RM 295); fixes #5014
Change-Id: I77529f91b0d6b59640bda21be909f84fdc049614

Former-commit-id: 721938a9fd9a270a2b886eb19de6df70fd62555d
2014-10-15 18:41:58 +00:00
Brian.Dyke
41e3037133 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: b0fef17ac648ed5d13d6125fa600c915b131147d
2014-10-15 13:55:32 -04:00
Juliya Dynina
9825175171 Merge "ASM #16844 - WarnGen can become disabled when moving storm track" into asm_14.3.1
Former-commit-id: 64318d29379dc904be07fa6bc1d38a51642e0476
2014-10-14 07:10:10 -05:00
Juliya Dynina
33e30cab01 Merge "ASM #258 - cross section - switching the log plot to z-coordinate scale" into asm_14.3.1
Former-commit-id: 5a639cc5850b906df927db1069bcf60cd68f15ab
2014-10-10 14:43:13 -05:00
David Friedman
955809450d ASM #16844 - WarnGen can become disabled when moving storm track
Change-Id: Ic54b4f10eea64db40ce7f9c5a787fe344a8d916a

Former-commit-id: f4000b425b8da6bb16fe124c0e5eaaab78a6b3b2
2014-10-10 19:33:21 +00:00
Brian.Dyke
862712a00f Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 4b2f00f3baeb6715ff76beb823978605742bc13d
2014-10-10 13:17:54 -04:00
Shawn.Hooper
cea5061c61 ASM #13467 - GFE: Need to add Beach Hazards Statement
Change-Id: Icd52e8f1cd05f1f1ecd0b43458593e95496e0db6

Former-commit-id: 457c467d7437c5550bb8727e813d8aa9d9c338a9
2014-10-10 13:14:25 -04:00
Brian.Dyke
f85eb2d0ac Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 344f436cfabfa5c1d0aa552467be7a6f9656a1ec
2014-10-10 11:01:01 -04:00
David Friedman
40f7e8df44 ASM #258 - cross section - switching the log plot to z-coordinate scale
Change-Id: Ie2fd21c0b65d17f778d69daf7120e47a6f4e552a

Former-commit-id: f187f262a28e0ee9df2b75eff7d1f5382a729ac3
2014-10-10 14:18:54 +00:00
Brian.Dyke
5625dc82b6 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: ba029f5d848cc33426154d815e29e1dddb6c3ddd
2014-10-09 15:37:02 -04:00
Ron Anderson
c7bf818989 Issue #3684 Fix GFE notification sending
Change-Id: I3b2ab7f454cb9454a9827ef994002d1b2348f462

Former-commit-id: b538cd55c0662d3d593522817986109c7e03625a
2014-10-09 09:21:29 -05:00
Ron Anderson
4d0c1b3151 Issue #3684 Fix NPE in GridParmManager
Change-Id: I9b40e8cbf0032ca531723ff782b77e1ac9750c84

Former-commit-id: bcc256c7c4a737a822ac30d0de8d3378818917da
2014-10-08 18:39:56 -05:00
Ron Anderson
4a1a3aef82 Issue #3684 Fix some issues found after #3684 with certain GFE configurations
Change-Id: I92b45588d9d4fe9169708c07119767017426d468

Former-commit-id: 6dc55b51414414aa416c9ad0c688d1d34ba08c17
2014-10-08 18:05:27 -05:00
Juliya Dynina
240917cf96 Merge "ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM" into asm_14.3.1
Former-commit-id: 7a0da7440a3e5e1696cc676dc3405d2aaa95252b
2014-10-08 12:00:39 -05:00
Sean Webb
c3f3140c4f Merge "ASM #15672 - fixed script to allow for full path of input file to be passed" into asm_14.3.1
Former-commit-id: 986a78cef3d8814e04035b00545a289171c7cc8a
2014-10-07 14:04:58 -05:00
Kevin.Johnson
355274e7ac ASM #15672 - fixed script to allow for full path of input file to be passed
Change-Id: Id4d9b71aaa8fb5ba26f5fc940e43ad149305cbae

Former-commit-id: 0982ab6536679921a6afdc85166fe57e92aeac63
2014-10-07 14:55:41 -04:00
Ron Anderson
34eafba2da Issue #3684 Additional changes to keep IFPServers better synchronized
Change-Id: Ibb1f28d07a5792d4f23eb3232b75099b259a7064

Former-commit-id: 8a8f82e5916d4a71fa639eb16057e2c68276ecff
2014-10-07 11:51:39 -05:00
Ana Rivera
6fe04386ca VLab Issue #4928 - Workaround pqact pattern for HRRR; fixes #4928
Change-Id: I1ae3abdcb470c0a306cde8a13070be47a40a1e87

Former-commit-id: 95d8b4abb4d3cb1cf63fd21a7bf188f6c3cb67b5
2014-10-07 13:33:59 +00:00
Nate Jensen
ef6da2a181 Merge "Issue #3686 fix kml export when maps are the only thing loaded" into omaha_14.3.1
Former-commit-id: 03ed17c8994b00ea37c1c591760c9b7c452dfcde
2014-10-06 15:53:19 -05:00
Nate Jensen
446e0bcdf6 Issue #3686 fix kml export when maps are the only thing loaded
Change-Id: I4741da935b0ef24bd8d0d0d114151404038828a0

Former-commit-id: 9dac0fcf997feeecdd8c581ae8fd72581c32d095
2014-10-06 15:41:42 -05:00
Qinglu.Lin
636f054077 ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I2a64416b861d3b374538db8efad51a9509a87892

Former-commit-id: 7124fd252f130417a9dcdac148480058d6eb0aba
2014-10-06 16:05:26 -04:00
Michael Gamazaychikov
f0b644d92e ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed.
Change-Id: Iee5611826c4f26cec95daa6277c84a2e6a7ae410

Former-commit-id: dff1c1d6fcc5fd0572dd924cfdf7979fc2a18463
2014-10-06 15:32:10 -04:00
Darrel Kingfield
8113b2ba69 VLab Issue #4922 - Rotation Tracks patch check-in
Former-commit-id: 48565726c39ea8139d4a3dfd505732cee2d32b16
2014-10-06 10:01:36 -05:00
Brian.Dyke
f440da9c70 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 23d16004c389f0ef708bee2a8bfb84d465b7b36b
2014-10-03 14:04:46 -04:00
Brian.Dyke
196318688a Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: c2beb2c0ec3a4ac3beb3ba471be2da3d747b0b21
2014-10-03 08:18:15 -04:00
Brian.Dyke
95a2d305ad Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 038fa8431fd565f7fe4ecf1c196311d6710539ee
2014-10-03 08:15:55 -04:00
Ana Rivera
2b02e4fb91 VLab Issue #4910 - Update pqact pattern for HRRR; fixes #4910
Change-Id: I5675fa2a6b73e2345ec06cd293a0a835d977c01c

Former-commit-id: 45ef67bdc20e3960ddde86e87e993ab6ff957a86
2014-10-02 21:19:27 +00:00
Ana Rivera
936f035e97 Merge branch 'master_14.2.4' into field_14.2.4
Change-Id: Ic4c2c59213aa519b1e8068d252df3a25b06c98d7

Former-commit-id: 6d949bdb5231117eec3d89996cf3586fbb6504c1
2014-10-02 20:53:31 +00:00
Brian.Dyke
2a911984f0 Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
Former-commit-id: 441fc7561a8526422f9b73b9c47cd220f0babb54
2014-10-02 10:44:50 -04:00
Brian.Dyke
65ad6056b6 Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 8fa6749e28cb247ae63307f1423351c23ec0eb87
2014-10-02 10:38:51 -04:00
Brian.Dyke
f47840e4d9 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: ece734cb6218a80fa2dda1b3c43673dc5a31bfbb
2014-10-02 10:24:04 -04:00
Brian.Dyke
4bc465bfbd Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: f26e54011d334972bb1e999304b1b2d13a1c408f
2014-10-02 10:15:34 -04:00
Steve Harris
e201e1a493 Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1
Former-commit-id: ace8473f96c6151918ee8ecf61e3b8986d98a68a
2014-10-02 08:09:02 -05:00
Slav Korolev
f7bcb81010 Issue #3659 - Enabled to display HFR-EAST_6KM or HFR-WEST_6KM data as a Time Series
Former-commit-id: 2a03c64bb098a141c82aac4bab42d7d9f4a6296f
2014-10-01 16:45:33 -04:00
Shawn.Hooper
f9428ace1f ASM #15033 - Fix IBW templates and 14.2.1 template corrections
Change-Id: I2677b93f897640318d8f89da72e49ba398d1d720

Former-commit-id: ea8e4c3a30bceb2f3b53159317382ae651aa5531
2014-10-01 15:58:48 -04:00
Brian.Dyke
5ed17c0e24 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 622e63224b6d6bf1d6ced874658bbd9db381799b
2014-10-01 15:36:06 -04:00
Nate Jensen
482af416b3 Issue #3679 fix bug when performance pref page changes
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15

Former-commit-id: e2d5957c02ba210e1964d00f37a00455f3326b37
2014-10-01 11:53:40 -05:00
dmsys
8c3625cfec Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm

Former-commit-id: 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c
2014-09-30 13:45:54 -04:00
Nate Jensen
057e5eda1a Merge "Issue #3669 Ensure best res does not parse alert messages." into omaha_14.3.1
Former-commit-id: 9e22fa02bb9f47d8332815059f2f5ae2d2ef6083
2014-09-29 17:50:34 -05:00
Ben Steffensmeier
c573db2918 Issue #3669 Ensure best res does not parse alert messages.
Former-commit-id: e93157375f90c6cc2038db9a78346592e4d46b0e
2014-09-29 11:20:33 -05:00
Steve Harris
46da726675 Merge branch 'master_14.3.1' (14.3.1-21,22) into omaha_14.3.1
Former-commit-id: 49ad8e0e780443a0439227694a92ec8ab683b125
2014-09-29 11:14:32 -05:00
Brian.Dyke
0c1b83b644 Merge branch 'asm_14.2.4' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 6e79993fbf34ebd832ca07356cbac003efaf6405
2014-09-29 11:55:16 -04:00
Sean.Webb
fbd892909b Merge "ASM #16720 - Added pushd and cd prior to patch extraction" into asm_14.2.4
Former-commit-id: c62a7e14e82c7274ed1868d73446aab895901546
2014-09-29 10:35:10 -05:00
Brian.Dyke
0a497fc015 Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 01cb1dc674ae1249d97dc10be5c068de0ed2a222
2014-09-29 11:20:57 -04:00
Sean.Webb
02e187a609 ASM #16720 - Added pushd and cd prior to patch extraction
Change-Id: Iac7658d312721b1cc992a5c96a596120b6c5b225

Former-commit-id: c2af0284e9146dff8431ecd4f6ce88437ea83d9f
2014-09-29 10:24:04 -04:00