Commit graph

9233 commits

Author SHA1 Message Date
Ron Anderson
44d41e6253 Merge "Omaha #4547 More warngen template fixes." into omaha_16.1.1
Former-commit-id: 46e816f07874bf972365c5c943277d5de114a744
2015-07-21 13:03:57 -05:00
Ron Anderson
64741d7a70 Omaha #4547 More warngen template fixes.
Change-Id: I9619681888bbebc681461f190231cebf325d405f

Former-commit-id: 66b051d8a7a791c8ffc2cf48e1f15f40d47ae71a
2015-07-21 12:56:12 -05:00
Ron Anderson
1c4d5a5a9d Omaha #4013 Allow rsyncGridsToCWF_client.sh to use entire EDEX cluster
Change-Id: I98a849bbd96a35ac8f3e418c3410dac5839e77b4

Former-commit-id: 7276286f419d5baba1efb2374eec2f3b903973d9
2015-07-21 12:42:01 -05:00
Richard Peter
c3bf9eb17c Omaha #4500 - Fix ZoneSelectorResource column mapping
Change-Id: I541f9e6003e5dcd0a29078df32677ccc5dcb8c68

Former-commit-id: b7a7761543d5dbdbf6288afc45bd01fea650cb96
2015-07-21 11:45:27 -05:00
Juliya Dynina
cf848b6ffd Merge "ASM #17584 SCAN: Problem with storm cell table display during data update" into asm_16.1.1
Former-commit-id: a54ea78a3373e2a32f3b2e5da37d17495ae13091
2015-07-20 14:50:44 -05:00
Ying-Lian.Shi
44d9356389 ASM #17584 SCAN: Problem with storm cell table display during data update
Change-Id: I6e38fcd8e6209d45f0826302d2d0b83b07afcbdc

Former-commit-id: 96d045d9c30e4f01a0a8ba3cd7a0a7ce233158f4
2015-07-20 17:46:45 +00:00
Nathan Bowler
8583f14fb2 Omaha #4343 Fix merge issues caused by Util->RcmUtil rename.
Change-Id: Id0d2778594875886ef13a4754786a3486051d3fa

Former-commit-id: 189311e801b8c507b5ccb1121da5511665d74d28
2015-07-20 13:35:04 -04:00
Ana Rivera
9a33597d6e Merge branch 'omaha_16.1.1' into field_16.1.1
Change-Id: I9da773e70da7bb8d62253093f20aebd8aea328f6

Former-commit-id: 0c909272ebdaf4ce94195b54a021a38c1e174ff3
2015-07-20 15:56:51 +00:00
Ana Rivera
d6196390e2 Merge branch 'master_15.1.1'(OB_15.1.1-24) into field_16.1.1
Change-Id: I859c9a2d9be2076e9eac89b4a5a877f37ca54074

Former-commit-id: d6f0e355d72c9be4d55c5e161331e55367bdb7b8
2015-07-20 15:46:28 +00:00
Fay.Liang
92654e8afe Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: bf3b5449b37dac2ff8c4d0763b0bd313ef0b4a4d
2015-07-20 11:38:13 -04:00
Fay.Liang
54c8991452 Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: 1fd720950240b2d57c4689d1994ad68d51855017
2015-07-20 11:37:24 -04:00
Fay.Liang
3e6ab62572 Merge branch 'asm_14.4.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.2
Former-commit-id: a5b480cae18a0d396098c52d072324532e176a54
2015-07-20 10:09:07 -04:00
Steve Harris
c9ca91f628 Merge tag 'OB_15.1.1-24' into omaha_16.1.1
15.1.1-24


Former-commit-id: 1d1041a38924d512d59ab98925b8114f4a657327
2015-07-20 09:05:30 -05:00
Steve Harris
151c4858d5 Merge tag 'OB_15.1.1-24' into omaha_15.1.1
15.1.1-24


Former-commit-id: 506030a09d343f7a5e532a2e89fafe7a0635e145
2015-07-20 08:55:26 -05:00
Michael Gamazaychikov
7530aa788b ASM #17716 - WarnGen: assigning a MultiPolygon to a Polygon causes failure in creating SVS.
Change-Id: Ifacc23e1004cd934d913bd7d2b0ae113e8cedb05

Former-commit-id: f6608d26c83f0a2e4a8da8f1bbfe7b8c724c6554
2015-07-20 08:45:26 -04:00
David Friedman
9db5891824 ASM #17314 - WarnGen: certain counties not locking in WarnGen
Change-Id: I756afe7cb6f590bb6f48c36a9bcf69fcac022e07

Former-commit-id: 8d5845c49eb706b28c85d836cbc35c7e20ea1adf
2015-07-17 20:05:26 +00:00
Fay.Liang
58cec41be1 Merge branch 'omaha_16.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: b03e417128f7a7f2e493b4b3b925641ee1aed94f
2015-07-17 14:45:32 -04:00
Richard Peter
dfc255531a Merge "Omaha #4500 - Fix SQL Injection Concerns." into omaha_16.1.1
Former-commit-id: 2b25be688266a27f564d5acff991d1e9a94dd081
2015-07-17 13:35:21 -05:00
Ron Anderson
df708de1e4 Omaha #4547 Fix some more issues with warngen templates
Change-Id: I4d7d2635def75a7262b2c70bd699ce37914cbe1f

Former-commit-id: 908dbaea4585226b8742f713dc2a7f20752cee2c
2015-07-17 10:09:57 -05:00
Fay.Liang
131458f108 Merge branch 'tcv_14.4.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.2
Former-commit-id: d0d2febc777f712f95804e7035f976c94e141cdb
2015-07-17 11:05:19 -04:00
Fay.Liang
4829ba55d1 Merge branch 'asm_14.4.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.2
Former-commit-id: d5432918e6f54d4331265d3ef294a93a950955c3
2015-07-17 11:01:01 -04:00
Nate Jensen
89bf57c0d1 Merge "Omaha #4658 Fixed expiration times in FFMP DAF access Change-Id: Iac02790c4d24efc220b9c0b5d488df403681b3be" into omaha_16.1.1
Former-commit-id: 14012632785578189b2c196eae493d59cd9a96f8
2015-07-16 16:57:57 -05:00
Dave Hladky
91aab92db5 Omaha #4658 Fixed expiration times in FFMP DAF access
Change-Id: Iac02790c4d24efc220b9c0b5d488df403681b3be

Former-commit-id: 94de80dd125cd4a004678e7d0c92fc8d0e99f70e
2015-07-16 16:15:10 -05:00
steve.naples
bdd9b93873 ASM #17561 - MPE: Daily QC disagg 6 hr values always zero.
Change-Id: I91ca25ae0afd442759315e0cd2d894ecc2001214

Former-commit-id: 450ff9256aa4ca845f3267e049153278bf350280
2015-07-16 17:23:27 +00:00
Juliya Dynina
71a18fe5df Merge "ASM #16769 - Warngen can include a city in the 4th bullet (locations impacted list) that is not officially in that county." into asm_16.1.1
Former-commit-id: e9dd4381ac017046db7f8413e2323f445dfe7edb
2015-07-16 10:16:16 -05:00
Sarah Pontius
890c650335 VLab Issue #9419 - Advisory Sorting Not Accurate and Consistent; fixes #9419
Change-Id: I15e9f32a23e1509e3473fa8c49a680dea3cbc7da

Former-commit-id: 47f8e240c94a47991ca98d1002707143f8181ebb
2015-07-16 09:05:21 -06:00
Michael Gamazaychikov
ff5198a58e ASM #16769 - Warngen can include a city in the 4th bullet (locations impacted list) that is not officially in that county.
Change-Id: I7d4ca4b5b50ea03cbd9f693a32b4cae8ce99b098

Former-commit-id: cef7dbe4975453510ae7a58bd7b58be7bebd3b9b
2015-07-16 10:40:17 -04:00
David Friedman
37082b074d ASM #17741 - Watches not showing up in Warning Products in 15.1.1
Change-Id: I0ecd8d7de532465ded64f67a20758cfdb7c2d7d1

Former-commit-id: 5e316fafdd46ab5fe30c24dd67ac86669cdb69ac
2015-07-16 14:12:24 +00:00
Michael Gamazaychikov
24c42c479a ASM #17716 - WarnGen: assigning a MultiPolygon to a Polygon causes failure in creating SVS.
Change-Id: Id521b7c71c31b28e8668ab6a8d91f7661ebc79bb

Former-commit-id: 469652fbde56520e971edbc15b0d921969abb8e1
2015-07-16 09:21:29 -04:00
Fay.Liang
fca8f275b2 Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: f8895b88d975a88553a494a7c616b4ecf702fa16
2015-07-15 14:37:27 -04:00
Fay.Liang
c97d6f5f37 Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: d17bfc702388ea2ed068852c08eff0c32eed62ff
2015-07-15 14:35:58 -04:00
Nate Jensen
0f9dc9a877 Merge "Omaha #4512 Add bundle files to Redbook menus XML" into omaha_16.1.1
Former-commit-id: 4e14cbf6926602d3966ce90f270d27232a2ddacd
2015-07-14 17:38:38 -05:00
Lee Venable
bf7b520ae0 Merge "Omaha #4311 Additional fixes for alertViz to prevent display ressizing to 0 height and acknowledge confirmation dialog going behind" into omaha_16.1.1
Former-commit-id: b920e261b160e54c21128b1b6718ee3ff27863e4
2015-07-14 17:34:29 -05:00
David Friedman
168de4d871 ASM #13900 - Loading 4 panels from procedures are not time matched
Change-Id: If3f116711ede5e5c78a3f08c3f9a05887e54ba95

Former-commit-id: 262cb246a874c1f123385ba1fed679f2d1f96cf2
2015-07-14 20:21:37 +00:00
Mark Peters
0f691a8adc Omaha #4512 Add bundle files to Redbook menus XML
Change-Id: I407c569aacbb41e980ba48a09d7a2af72ebb0708

Former-commit-id: 5262da76ebf91ac2f376e6ea65c2de16a7828176
2015-07-14 14:34:20 -05:00
Ron Anderson
f010ad8605 Omaha #4311 Additional fixes for alertViz to prevent display ressizing to 0 height
and acknowledge confirmation dialog going behind

Change-Id: Ie4b3c6f910037db765aa46d619df491bdf7221db

Former-commit-id: 5640b3c3594d74614907af06b8f9452c917a04ee
2015-07-14 10:40:35 -05:00
Ron Anderson
e86e0dd6da Merge "Omaha #4537 Fix smartInit issues with HRRR sub-hourly data." into omaha_16.1.1
Former-commit-id: 7f9cae62b3fe3274525ebb8e5161feb7fbea7e59
2015-07-14 10:30:59 -05:00
David Friedman
661500fb18 ASM #17672 - Radar decoding can fail with an OutOfMemory error on certain products
Change-Id: If5045934eb1c44e3b4270fe9ae6f3aee4f175e51

Former-commit-id: 43427def5c959a59660eb687fc1ff3c9a8737a37
2015-07-14 01:06:42 +00:00
Steve Harris
55b82a66ff Merge branch 'omaha_sails_15.1.1' into omaha_16.1.1
Conflicts:
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/GridLightningResource.java


Former-commit-id: b66814c4efc93113c131298b904f02675cda88ea
2015-07-13 18:39:29 -05:00
Steve Harris
30d49fff86 Merge branch 'omaha_15.1.1' into omaha_sails_15.1.1
Former-commit-id: cf104ad05ee334aee224342743ab3b142d62cacd
2015-07-13 18:29:34 -05:00
Steve Harris
c2ab43b206 Merge tag 'OB_15.1.1-22' into omaha_15.1.1
15.1.1-22


Former-commit-id: 2db2aac7112c3cb27eee4a8ac233865ffe2d6b0b
2015-07-13 18:13:44 -05:00
Ron Anderson
c1724c364e Omaha #4537 Fix smartInit issues with HRRR sub-hourly data.
Change-Id: Ifcd616c69e5eed8455909f298aaedaf1947e990c

Former-commit-id: c32d496014b97e1787e41a01e59fd7eb8e6c53bb
2015-07-13 18:09:22 -05:00
Ron Anderson
cb54a0d66b Merge "Omaha #4547 Fix more issues with extremWindWarningFollowup.vm" into omaha_16.1.1
Former-commit-id: f974fa93c495bfd7a0a8c8c717b912b7c84ef56d
2015-07-13 17:48:38 -05:00
Ron Anderson
aff1b9b21e Omaha #4547 Fix more issues with extremWindWarningFollowup.vm
Change-Id: Ic3b1311c445507170ebd8a175767d2816731254c

Former-commit-id: 6a31d2379a8b5be9fb2bf51ac43e251a4541d523
2015-07-13 17:44:22 -05:00
Nate Jensen
79bd634511 Merge "Omaha #4474 Fix alert view dispose error." into omaha_16.1.1
Former-commit-id: f0c209cc9c26350cd50eb04db9fc863b84704496
2015-07-13 17:36:09 -05:00
Richard Peter
47bdd9984d Omaha #4500 - Fix SQL Injection Concerns.
Change-Id: I3af5ce39d163a212f66e675d3386ae5c68b9b295

Former-commit-id: 7613c06d4351c52dcc8e49d6bc64ecb0166f72e7
2015-07-13 16:31:26 -05:00
Ben Steffensmeier
aa964932a3 Omaha #4474 Fix alert view dispose error.
Former-commit-id: 23c0ed05a9f3546217089af681c4cc3fff5fbc3d
2015-07-13 16:03:08 -05:00
Greg Armendariz
f9ec20ac12 Omaha #4555 - Source profile scripts
Former-commit-id: 65797ec98d18fff34303ff67a40bdb0ec7230c21
2015-07-13 13:38:42 -05:00
Ron Anderson
1c6dc6010f Omaha #4648 Fix bullets in follow up hazard products
Change-Id: Iaeba35d5893b5f439858d35dfb849b3d7635f27b

Former-commit-id: be8cbc18536402d2b8fbd02a94bf707e8f6f2b8e
2015-07-13 11:59:42 -05:00
Mark Peters
a7059ba80c Omaha #4641 Volume browser sources sorting and null checks
Change-Id: Iabd25162a4ea115d7cf54145fb6c2496241a20e4

Former-commit-id: d1a484d56a9351c5b75c851435fc3d72d987ee5d
2015-07-13 11:48:17 -05:00