Commit graph

6308 commits

Author SHA1 Message Date
Rici.Yu
b9269162a6 ASM #16863 - GFE: Check in version 2.12 of the Objective Analysis utility
Change-Id: Ia377d571db68d0078399460ad1d434ba4dad510b

Former-commit-id: 902d1b1e4fed90ff216eab2ee5fc3f198bf7fc6d
2014-10-24 10:54:37 -04:00
Shawn.Hooper
3b4b9d262a ASM #16805 - Removed references to obsolete license.txt file and renamed Master_Rights_file.pdf
Change-Id: I2b3a021440c834df3505ed11a2883f0fb214a868

Former-commit-id: e29cf5a57591e5a25b6e73b267c0abb46e9f95c2
2014-10-22 14:47:42 -04:00
Shawn.Hooper
92204e05a1 Merge "ASM #13467 - Update GenericHazards.py for Shannon" into asm_14.3.1
Former-commit-id: 4bbcf01f8a3abf038f3183c5872bc8f9f12624a1
2014-10-21 10:35:01 -05:00
Shawn.Hooper
a96693cb70 ASM #16805 - Fix rpms/legal/ directory
Change-Id: I369e4d5423c760bf689180239f15cfd363a202b3

Former-commit-id: 94872b496bec6c427030ea353856466809d2e6c1
2014-10-21 11:17:45 -04:00
Shawn.Hooper
ddeec493c3 ASM #13467 - Update GenericHazards.py for Shannon
Change-Id: Ic1131929aa14f97cff0e1cf92e30c338470f368e

Former-commit-id: f4e8f7493bbfb025e8040f7663dc582414a87413
2014-10-21 11:11:34 -04:00
Matthew Howard
587cf1b66e Merge "ASM #16858 - Check in SerpISC tool." into asm_14.3.1
Former-commit-id: 4a965632119a9349cf320125b97db52498a760c8
2014-10-20 13:56:06 -05:00
Rici.Yu
6958f11ea7 ASM #16858 - Check in SerpISC tool.
Change-Id: I4c15360c377370bd757ed2eaad7aeade49412fd6

Former-commit-id: 1e8961e4f4a8168b667ce4b689efd88157dfb61c
2014-10-20 14:39:46 -04:00
Shawn.Hooper
65065f2380 ASM #16805 - Update master rights and license files for 14.3.1.
Change-Id: Ifb5b67010a01dfa9805e64d408f5688d10d7bf82

Former-commit-id: f72ec046e98bdb6734dbce10ef472dd5294c59ba
2014-10-20 14:36:31 -04:00
Brian.Dyke
93df82ac92 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
5f6c9bc837 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
118f34bbf1 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
0d5f2c0add 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
f3c8f4eeb0 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
927b2dea69 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
e6ac4980b9 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
1421171def 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
32b7e80d82 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
68f985d668 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
05e4e92e65 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
0c61661989 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
6ae3795b7c 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
ad73a90b53 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
Juliya Dynina
4911f61f10 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
01b52daea2 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
5cf5cac9f7 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
Nate Jensen
b2dcfdf572 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
9025e166dd 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
47be3aa143 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
e6d3baaa9c 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
aa168071aa VLab Issue #4922 - Rotation Tracks patch check-in
Former-commit-id: 48565726c39ea8139d4a3dfd505732cee2d32b16
2014-10-06 10:01:36 -05:00
Brian.Dyke
92762f46c7 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
20dd249d2c 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
f3f95aabb0 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
2ac30f6c22 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
97464ea153 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
cc34483b0b 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
Shawn.Hooper
ae02cbc2da 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
a4bfbea3c2 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
f2633a56c0 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
9f4560c480 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
510d26050d 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
95b096192b Issue #3669 Ensure best res does not parse alert messages.
Former-commit-id: e93157375f90c6cc2038db9a78346592e4d46b0e
2014-09-29 11:20:33 -05:00
Steve Harris
c03bc273da 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
0e0255ce5b 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
2d531d73fd 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
46af1d0857 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
600b75bd9f 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
Sean.Webb
6e1f0363c8 Merge "ASM #16720 - Removed extraneous popd which was changing dir when not needed" into asm_14.2.4
Former-commit-id: 8f44d89f1d11cd587106f7eda3edec93802f5cf3
2014-09-29 08:31:44 -05:00
Sean.Webb
78f83fa594 ASM #16720 - Removed extraneous popd which was changing dir when not needed
Change-Id: I3c5521cfa0d0223cc8a6a3094d9efa7c6bf9f683

Former-commit-id: 4faea9724adf17d0bec7f013bafc7f8dd2f7499e
2014-09-29 08:21:00 -04:00
Brian.Dyke
142432ba5e Merge branch 'asm_14.2.3' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: 93ddf672c137c7221e9595e8b5c1b279084cb451
2014-09-26 16:14:06 -04:00