Brian.Dyke
|
aa47e1edb8
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 0d5f2c0add [formerly c60124fa61 [formerly ea0a81b12c7b1a0154361d97882ef65fc55b20e1]]
Former-commit-id: c60124fa61
Former-commit-id: 7f719d0124
|
2014-10-16 11:21:39 -04:00 |
|
Brian.Dyke
|
537e0b5230
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: f3c8f4eeb0 [formerly 86a76b3fe6 [formerly 53bfd53b6fea22c354fa6ca501ebfb3ff937f4f2]]
Former-commit-id: 86a76b3fe6
Former-commit-id: 7953b736e5
|
2014-10-16 11:20:36 -04:00 |
|
Ana Rivera
|
3b5fd4499b
|
VLab Issue #5014; Workaround pqact pattern for ESTOFS (RM 295); fixes #5014
Change-Id: I77529f91b0d6b59640bda21be909f84fdc049614
Former-commit-id: 927b2dea69 [formerly f516cc441d [formerly 721938a9fd9a270a2b886eb19de6df70fd62555d]]
Former-commit-id: f516cc441d
Former-commit-id: ee4cdc015f
|
2014-10-15 18:41:58 +00:00 |
|
Brian.Dyke
|
43ecc95cb9
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: e6ac4980b9 [formerly 41e3037133 [formerly b0fef17ac648ed5d13d6125fa600c915b131147d]]
Former-commit-id: 41e3037133
Former-commit-id: cb92ade16f
|
2014-10-15 13:55:32 -04:00 |
|
Juliya Dynina
|
517a158c00
|
Merge "ASM #16844 - WarnGen can become disabled when moving storm track" into asm_14.3.1
Former-commit-id: 1421171def [formerly 9825175171 [formerly 64318d29379dc904be07fa6bc1d38a51642e0476]]
Former-commit-id: 9825175171
Former-commit-id: bc1c9b692d
|
2014-10-14 07:10:10 -05:00 |
|
Juliya Dynina
|
7cdf797188
|
Merge "ASM #258 - cross section - switching the log plot to z-coordinate scale" into asm_14.3.1
Former-commit-id: 32b7e80d82 [formerly 33e30cab01 [formerly 5a639cc5850b906df927db1069bcf60cd68f15ab]]
Former-commit-id: 33e30cab01
Former-commit-id: 6beb107913
|
2014-10-10 14:43:13 -05:00 |
|
David Friedman
|
b8556f48c4
|
ASM #16844 - WarnGen can become disabled when moving storm track
Change-Id: Ic54b4f10eea64db40ce7f9c5a787fe344a8d916a
Former-commit-id: 68f985d668 [formerly 955809450d [formerly f4000b425b8da6bb16fe124c0e5eaaab78a6b3b2]]
Former-commit-id: 955809450d
Former-commit-id: 455f1ad7aa
|
2014-10-10 19:33:21 +00:00 |
|
Brian.Dyke
|
9d33c64bd2
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 05e4e92e65 [formerly 862712a00f [formerly 4b2f00f3baeb6715ff76beb823978605742bc13d]]
Former-commit-id: 862712a00f
Former-commit-id: a1de83a7a8
|
2014-10-10 13:17:54 -04:00 |
|
Shawn.Hooper
|
328b9f9d42
|
ASM #13467 - GFE: Need to add Beach Hazards Statement
Change-Id: Icd52e8f1cd05f1f1ecd0b43458593e95496e0db6
Former-commit-id: 0c61661989 [formerly cea5061c61 [formerly 457c467d7437c5550bb8727e813d8aa9d9c338a9]]
Former-commit-id: cea5061c61
Former-commit-id: bfa9eb0dea
|
2014-10-10 13:14:25 -04:00 |
|
Brian.Dyke
|
2e6f3e057a
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 6ae3795b7c [formerly f85eb2d0ac [formerly 344f436cfabfa5c1d0aa552467be7a6f9656a1ec]]
Former-commit-id: f85eb2d0ac
Former-commit-id: 797a9c6c10
|
2014-10-10 11:01:01 -04:00 |
|
David Friedman
|
49de7df204
|
ASM #258 - cross section - switching the log plot to z-coordinate scale
Change-Id: Ie2fd21c0b65d17f778d69daf7120e47a6f4e552a
Former-commit-id: ad73a90b53 [formerly 40f7e8df44 [formerly f187f262a28e0ee9df2b75eff7d1f5382a729ac3]]
Former-commit-id: 40f7e8df44
Former-commit-id: 676ee09f11
|
2014-10-10 14:18:54 +00:00 |
|
Juliya Dynina
|
ac23208143
|
Merge "ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM" into asm_14.3.1
Former-commit-id: 4911f61f10 [formerly 240917cf96 [formerly 7a0da7440a3e5e1696cc676dc3405d2aaa95252b]]
Former-commit-id: 240917cf96
Former-commit-id: 1fb3bdb8a1
|
2014-10-08 12:00:39 -05:00 |
|
Sean Webb
|
b8ef7759e0
|
Merge "ASM #15672 - fixed script to allow for full path of input file to be passed" into asm_14.3.1
Former-commit-id: 01b52daea2 [formerly c3f3140c4f [formerly 986a78cef3d8814e04035b00545a289171c7cc8a]]
Former-commit-id: c3f3140c4f
Former-commit-id: c90be3ba42
|
2014-10-07 14:04:58 -05:00 |
|
Kevin.Johnson
|
80696f6c01
|
ASM #15672 - fixed script to allow for full path of input file to be passed
Change-Id: Id4d9b71aaa8fb5ba26f5fc940e43ad149305cbae
Former-commit-id: 5cf5cac9f7 [formerly 355274e7ac [formerly 0982ab6536679921a6afdc85166fe57e92aeac63]]
Former-commit-id: 355274e7ac
Former-commit-id: dcecf025a2
|
2014-10-07 14:55:41 -04:00 |
|
Nate Jensen
|
31f3bb414f
|
Merge "Issue #3686 fix kml export when maps are the only thing loaded" into omaha_14.3.1
Former-commit-id: b2dcfdf572 [formerly ef6da2a181 [formerly 03ed17c8994b00ea37c1c591760c9b7c452dfcde]]
Former-commit-id: ef6da2a181
Former-commit-id: 9c95c255c2
|
2014-10-06 15:53:19 -05:00 |
|
Nate Jensen
|
1a4569eaef
|
Issue #3686 fix kml export when maps are the only thing loaded
Change-Id: I4741da935b0ef24bd8d0d0d114151404038828a0
Former-commit-id: 9025e166dd [formerly 446e0bcdf6 [formerly 9dac0fcf997feeecdd8c581ae8fd72581c32d095]]
Former-commit-id: 446e0bcdf6
Former-commit-id: f8278a9ad3
|
2014-10-06 15:41:42 -05:00 |
|
Qinglu.Lin
|
b11f115e03
|
ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I2a64416b861d3b374538db8efad51a9509a87892
Former-commit-id: 47be3aa143 [formerly 636f054077 [formerly 7124fd252f130417a9dcdac148480058d6eb0aba]]
Former-commit-id: 636f054077
Former-commit-id: 8372c15a61
|
2014-10-06 16:05:26 -04:00 |
|
Michael Gamazaychikov
|
74c03e5b81
|
ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed.
Change-Id: Iee5611826c4f26cec95daa6277c84a2e6a7ae410
Former-commit-id: e6d3baaa9c [formerly f0b644d92e [formerly dff1c1d6fcc5fd0572dd924cfdf7979fc2a18463]]
Former-commit-id: f0b644d92e
Former-commit-id: 3851e4c961
|
2014-10-06 15:32:10 -04:00 |
|
Darrel Kingfield
|
2a258e5db6
|
VLab Issue #4922 - Rotation Tracks patch check-in
Former-commit-id: aa168071aa [formerly 8113b2ba69 [formerly 48565726c39ea8139d4a3dfd505732cee2d32b16]]
Former-commit-id: 8113b2ba69
Former-commit-id: 66dcc60acf
|
2014-10-06 10:01:36 -05:00 |
|
Brian.Dyke
|
5da2026d2b
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 92762f46c7 [formerly f440da9c70 [formerly 23d16004c389f0ef708bee2a8bfb84d465b7b36b]]
Former-commit-id: f440da9c70
Former-commit-id: 85d83aefe0
|
2014-10-03 14:04:46 -04:00 |
|
Brian.Dyke
|
7390f6c3a8
|
Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
Former-commit-id: 20dd249d2c [formerly 2a911984f0 [formerly 441fc7561a8526422f9b73b9c47cd220f0babb54]]
Former-commit-id: 2a911984f0
Former-commit-id: db665d3876
|
2014-10-02 10:44:50 -04:00 |
|
Brian.Dyke
|
06f6dfc38a
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: f3f95aabb0 [formerly 65ad6056b6 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]]
Former-commit-id: 65ad6056b6
Former-commit-id: 006bdb00ad
|
2014-10-02 10:38:51 -04:00 |
|
Brian.Dyke
|
d1c62c3542
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 2ac30f6c22 [formerly f47840e4d9 [formerly ece734cb6218a80fa2dda1b3c43673dc5a31bfbb]]
Former-commit-id: f47840e4d9
Former-commit-id: d4888adc0f
|
2014-10-02 10:24:04 -04:00 |
|
Brian.Dyke
|
65ff0876ac
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 97464ea153 [formerly 4bc465bfbd [formerly f26e54011d334972bb1e999304b1b2d13a1c408f]]
Former-commit-id: 4bc465bfbd
Former-commit-id: 31f073ee3a
|
2014-10-02 10:15:34 -04:00 |
|
Steve Harris
|
0a8b36918a
|
Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1
Former-commit-id: cc34483b0b [formerly e201e1a493 [formerly ace8473f96c6151918ee8ecf61e3b8986d98a68a]]
Former-commit-id: e201e1a493
Former-commit-id: 09d8955b31
|
2014-10-02 08:09:02 -05:00 |
|
Shawn.Hooper
|
5254c781ef
|
ASM #15033 - Fix IBW templates and 14.2.1 template corrections
Change-Id: I2677b93f897640318d8f89da72e49ba398d1d720
Former-commit-id: ae02cbc2da [formerly f9428ace1f [formerly ea8e4c3a30bceb2f3b53159317382ae651aa5531]]
Former-commit-id: f9428ace1f
Former-commit-id: 22c3fde0ef
|
2014-10-01 15:58:48 -04:00 |
|
Brian.Dyke
|
64529eea01
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: a4bfbea3c2 [formerly 5ed17c0e24 [formerly 622e63224b6d6bf1d6ced874658bbd9db381799b]]
Former-commit-id: 5ed17c0e24
Former-commit-id: 0be927be2d
|
2014-10-01 15:36:06 -04:00 |
|
Nate Jensen
|
1a4b7cc454
|
Issue #3679 fix bug when performance pref page changes
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15
Former-commit-id: f2633a56c0 [formerly 482af416b3 [formerly e2d5957c02ba210e1964d00f37a00455f3326b37]]
Former-commit-id: 482af416b3
Former-commit-id: fce7d5899f
|
2014-10-01 11:53:40 -05:00 |
|
dmsys
|
70cb8d81b0
|
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: 9f4560c480 [formerly 8c3625cfec [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]
Former-commit-id: 8c3625cfec
Former-commit-id: f704781f4f
|
2014-09-30 13:45:54 -04:00 |
|
Nate Jensen
|
1b08756d5c
|
Merge "Issue #3669 Ensure best res does not parse alert messages." into omaha_14.3.1
Former-commit-id: 510d26050d [formerly 057e5eda1a [formerly 9e22fa02bb9f47d8332815059f2f5ae2d2ef6083]]
Former-commit-id: 057e5eda1a
Former-commit-id: 6d382220a3
|
2014-09-29 17:50:34 -05:00 |
|
Ben Steffensmeier
|
ed401f7250
|
Issue #3669 Ensure best res does not parse alert messages.
Former-commit-id: 95b096192b [formerly c573db2918 [formerly e93157375f90c6cc2038db9a78346592e4d46b0e]]
Former-commit-id: c573db2918
Former-commit-id: b333960362
|
2014-09-29 11:20:33 -05:00 |
|
Steve Harris
|
73f0f5b364
|
Merge branch 'master_14.3.1' (14.3.1-21,22) into omaha_14.3.1
Former-commit-id: c03bc273da [formerly 46da726675 [formerly 49ad8e0e780443a0439227694a92ec8ab683b125]]
Former-commit-id: 46da726675
Former-commit-id: fdfe16985d
|
2014-09-29 11:14:32 -05:00 |
|
Brian.Dyke
|
b89a2459ee
|
Merge branch 'asm_14.2.4' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 0e0255ce5b [formerly 0c1b83b644 [formerly 6e79993fbf34ebd832ca07356cbac003efaf6405]]
Former-commit-id: 0c1b83b644
Former-commit-id: 9661a1d7b1
|
2014-09-29 11:55:16 -04:00 |
|
Sean.Webb
|
691367ac10
|
Merge "ASM #16720 - Added pushd and cd prior to patch extraction" into asm_14.2.4
Former-commit-id: 2d531d73fd [formerly fbd892909b [formerly c62a7e14e82c7274ed1868d73446aab895901546]]
Former-commit-id: fbd892909b
Former-commit-id: c679d1cc46
|
2014-09-29 10:35:10 -05:00 |
|
Brian.Dyke
|
fac7a6aaa1
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 46af1d0857 [formerly 0a497fc015 [formerly 01cb1dc674ae1249d97dc10be5c068de0ed2a222]]
Former-commit-id: 0a497fc015
Former-commit-id: fce029653d
|
2014-09-29 11:20:57 -04:00 |
|
Sean.Webb
|
d3df1699db
|
ASM #16720 - Added pushd and cd prior to patch extraction
Change-Id: Iac7658d312721b1cc992a5c96a596120b6c5b225
Former-commit-id: 600b75bd9f [formerly 02e187a609 [formerly c2af0284e9146dff8431ecd4f6ce88437ea83d9f]]
Former-commit-id: 02e187a609
Former-commit-id: 224cddfe9b
|
2014-09-29 10:24:04 -04:00 |
|
Sean.Webb
|
801886c053
|
Merge "ASM #16720 - Removed extraneous popd which was changing dir when not needed" into asm_14.2.4
Former-commit-id: 6e1f0363c8 [formerly dc3ad9863d [formerly 8f44d89f1d11cd587106f7eda3edec93802f5cf3]]
Former-commit-id: dc3ad9863d
Former-commit-id: 9b25583e3a
|
2014-09-29 08:31:44 -05:00 |
|
Sean.Webb
|
86382f5396
|
ASM #16720 - Removed extraneous popd which was changing dir when not needed
Change-Id: I3c5521cfa0d0223cc8a6a3094d9efa7c6bf9f683
Former-commit-id: 78f83fa594 [formerly 0738a41cbf [formerly 4faea9724adf17d0bec7f013bafc7f8dd2f7499e]]
Former-commit-id: 0738a41cbf
Former-commit-id: 6840d55343
|
2014-09-29 08:21:00 -04:00 |
|
Brian.Dyke
|
008769daef
|
Merge branch 'asm_14.2.3' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: 142432ba5e [formerly 550ffba7b0 [formerly 93ddf672c137c7221e9595e8b5c1b279084cb451]]
Former-commit-id: 550ffba7b0
Former-commit-id: 8e459ec500
|
2014-09-26 16:14:06 -04:00 |
|
David Friedman
|
ea894ca5fc
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I13d9e58b1df3dd434cdea66060dbc5886c0e27f2
Former-commit-id: 05707d0f20 [formerly 6791e8d885 [formerly 78cc67f9d2f86c2088ffc5695c4dea879a9e2ebb]]
Former-commit-id: 6791e8d885
Former-commit-id: 86100b6ca8
|
2014-09-26 20:05:46 +00:00 |
|
Brian.Dyke
|
cf09c46335
|
Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 814b9a2869 [formerly 41921f7db2 [formerly 60756ddb841a0daa347493047b76d2fcb93f7f4a]]
Former-commit-id: 41921f7db2
Former-commit-id: 858cfa1078
|
2014-09-26 15:15:57 -04:00 |
|
Brian.Dyke
|
bef2315cae
|
Merge branch 'asm_14.2.4' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.4
Former-commit-id: f1755fb7ae [formerly 989a9c5835 [formerly 4ff65f7c83042dd40b5c2bf37ee54d12315c5714]]
Former-commit-id: 989a9c5835
Former-commit-id: 2495e16947
|
2014-09-26 14:20:34 -04:00 |
|
Brian.Dyke
|
698273b551
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: f26fe97ec4 [formerly 1ac61fb612 [formerly 5b570e5229628de88068edee1c70c26eec13f71a]]
Former-commit-id: 1ac61fb612
Former-commit-id: 396f9755dc
|
2014-09-26 14:19:03 -04:00 |
|
Brian.Dyke
|
67a9c88d27
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: a4f68caac6 [formerly 8245370186 [formerly 6ed90023551e25216c10d05f2568593992326900]]
Former-commit-id: 8245370186
Former-commit-id: f520ff97b6
|
2014-09-26 13:02:49 -04:00 |
|
Sean.Webb
|
7102ba66c9
|
Merge "ASM #16720 - Added updated palt.c to fix seq num in pqact pattern" into asm_14.2.4
Former-commit-id: 57342f0256 [formerly 96503843d9 [formerly d1ce11d690a1acf24fe82fc10acc83302e8f61f9]]
Former-commit-id: 96503843d9
Former-commit-id: e8585c9d29
|
2014-09-26 11:01:04 -05:00 |
|
Brian.Dyke
|
3b71fe393a
|
Merge branch 'omaha_14.2.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: bd983e1932 [formerly 586a504500 [formerly d6369c8346d1ed4d86ed3eb7adc47de0891c7fd7]]
Former-commit-id: 586a504500
Former-commit-id: 0045c3100f
|
2014-09-26 11:47:38 -04:00 |
|
David Friedman
|
52788dc473
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I8b8e9ae40596e5a3d5f0aa44d2e946aa7a68a1ae
Former-commit-id: db29ec9dec [formerly 33aee54b8f [formerly c8aa2fbfc35c872e2d50de2212eaf16db9b5483d]]
Former-commit-id: 33aee54b8f
Former-commit-id: 1737d16a5c
|
2014-09-26 15:13:56 +00:00 |
|
Sean.Webb
|
b186a8e714
|
ASM #16720 - Added updated palt.c to fix seq num in pqact pattern
Change-Id: I08d858beeae7f0fb211a3cf287b7763aa2cff9b5
Former-commit-id: 7d75d994c1 [formerly 628ab54d68 [formerly d59054c870fee17076aec22cd683ef1586a153da]]
Former-commit-id: 628ab54d68
Former-commit-id: eb959d100a
|
2014-09-26 10:49:37 -04:00 |
|
David Friedman
|
e186ecc15f
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I1698025cad4310f8fc30938294c161c1f9797f03
Former-commit-id: c85b0d1cfd [formerly 41820f112f [formerly 70b520c08670646047ffa753814f98c032938ff8]]
Former-commit-id: 41820f112f
Former-commit-id: cfcfc17a2b
|
2014-09-26 13:07:28 +00:00 |
|
David Friedman
|
15956c0d58
|
ASM #16783 - Warngen: Possible problem when there are two effective VTEC actions for a watch
Change-Id: I76599d23396fe64c9448440787e67d752ed6b028
Former-commit-id: e82f96193e [formerly 5755c120d5 [formerly 117c2f072b647e353456832f2f0088d51a660d65]]
Former-commit-id: 5755c120d5
Former-commit-id: c16f5c2e7c
|
2014-09-25 22:10:42 +00:00 |
|