Commit graph

4192 commits

Author SHA1 Message Date
Dave Hladky
0a29df8b76 Omaha #4774 plugin placement wrong.
Former-commit-id: 6d126dc07df8f12aace4e96bebe89da50c72378c
2015-08-25 12:51:33 -05:00
Dave Hladky
3a9febd758 Omaha #4774 Fixed deployment bug for DD and HS
Change-Id: I76b34d0f0f657b11990f5fd1a9d77733b48791e2

Former-commit-id: ac5a683b9a945c88fbb8a10ac7a363e335a71941
2015-08-24 15:23:49 -05:00
Bryan Kowal
f78f5a9680 Merge "Omaha #4735 - added missing includes to hydro modes for ALR EDEX." into omaha_16.1.1
Former-commit-id: cfbeee73ef5dd115c004c0386d9bfd363ef3b269
2015-08-24 14:25:12 -05:00
Bryan Kowal
db52a9bc15 Omaha #4735 - added missing includes to hydro modes for ALR EDEX.
Former-commit-id: f944294e35cc09bf7f9863d4762f48f102686ed9
2015-08-24 10:40:00 -05:00
Mark Peters
409baa5ba6 Omaha #4409 Alias geometry column names to make sure all requested columns are unique
Change-Id: Ida92adaf87fae3e082a7ed161ab4725ee5fb0b61

Former-commit-id: 8e593a05b3872e19bd0bbcc35fed8b557a578484
2015-08-21 15:47:45 -05:00
Steve Harris
d6ab160019 Merge tag 'OB_16.1.1-6' into omaha_16.1.1
16.1.1-6


Former-commit-id: 002910fe88718d1801018450799a658b42a6a696
2015-08-19 13:40:43 -05:00
Roger Ferrel
e6962d2c5e Omaha #4753 Fix accidental rename of BL0180.
Former-commit-id: c7c625229e440115f0d8d80e174ed811b0fd0666
2015-08-17 11:03:52 -05:00
Shawn.Hooper
77b4ce8a0b Merge branch 'asm_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: c199e711f1d1141a00876f4c93afdb2e6a7777b2
2015-08-13 14:34:17 -04:00
Matthew Howard
952a221aa0 Merge "ASM #17443 GFE Svcbu: Bug in scripts results in rsync_parms.ccc file not getting used" into asm_16.1.1
Former-commit-id: ce62c37738eb4483ea2e79ac96d4b0e5377393d9
2015-08-12 09:34:50 -05:00
Shawn.Hooper
6c30246931 ASM #17883 - Update mping feature.xml file
Change-Id: I44fb67d8d86c3eca661bcd09814b736794bacb47

Former-commit-id: 34c8d2ef320b0d8336f8ae3da9ba803f7ee66265
2015-08-11 16:17:31 -04:00
Ying-Lian.Shi
4d892154a5 ASM #17443 GFE Svcbu: Bug in scripts results in rsync_parms.ccc file not getting used
Change-Id: Ie4b48937b845165a3e4c4508abb0e322474193f4

Former-commit-id: 2ad5b3868b58bb8b48860ddd1bea94887f42df58
2015-08-10 18:09:27 +00:00
Ron Anderson
ea8812f51c Omaha #4547 More template fixes
Change-Id: Ifbf3341f669682157fd95d64bcccfd7c1b4243e7

Former-commit-id: 5a02fe4695575b841675dfde6ec3a7ce38c028b8
2015-08-10 11:58:14 -05:00
Steve Harris
380c76a769 Merge tag 'OB_16.1.1-3' into omaha_16.1.1
16.1.1-3


Former-commit-id: cf16b85be683f57537a2913627489d9c490a972b
2015-08-04 12:53:30 -05:00
Steve Harris
7b0c814fd0 Merge tag 'OB_16.1.1-2' into omaha_16.1.1
16.1.1-2


Former-commit-id: afbe137f83e60abbabd7a38890a1d3bde5f96555
2015-08-03 16:39:02 -05:00
Fay.Liang
5c5bc3a5b5 Merge branch 'field_16.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.1.1
Former-commit-id: 061ce49506ae6b538dad609a3be711aec3efae80
2015-07-31 16:53:30 -04:00
Fay.Liang
b60abcd015 Merge branch 'ncep_16.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.1.1
Former-commit-id: e1a18a5546a67d11e9ba48a7a00646c1a0d08249
2015-07-31 16:12:28 -04:00
David Friedman
4bdfeb8da8 Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1
Conflicts:
	cave/build/static/linux/alertviz/alertviz.sh
	cave/build/static/linux/cave/cave.sh
	cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/AlertvizJob.java
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.xdat/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.shef/src/com/raytheon/uf/common/dataplugin/shef/tables/Riverstat.java
	edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/process_configuration

Change-Id: I9acfead0148ca1df35b8f69cd556b40d8189c226

Former-commit-id: 33053b2a6b55dacfecb24d5cde2cd3068e999f2f
2015-07-30 20:53:19 +00:00
Ron Anderson
f24e1831f0 Omaha #4547 Fix case inconsistency impactTornadoWarning.vm for TORNADO EMERGENCY
Change-Id: I2a7b755fb61b2728b20884da839388a226c84152

Former-commit-id: 5759c8af522ade5a0a18535a2676451daaacd5c3
2015-07-30 13:23:53 -05:00
Mark Peters
32b5f874cf Omaha #4512 Check for redbookMapping.xml in common_static.configured, then cave_static.base
Change-Id: I759571640d72ec72fc76afcccd20314dc106f559

Former-commit-id: d6f42a6947d49170ace6654f30ab93a5cba57d1c
2015-07-21 13:23:39 -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
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
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
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
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
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
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
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
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
aff1b9b21e Omaha #4547 Fix more issues with extremWindWarningFollowup.vm
Change-Id: Ic3b1311c445507170ebd8a175767d2816731254c

Former-commit-id: 6a31d2379a8b5be9fb2bf51ac43e251a4541d523
2015-07-13 17:44:22 -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
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
Richard Peter
c2323b7a00 Omaha #4500 - Fix sql queries
Change-Id: I2ffeccf4d8a170d229490abb2fb7c9f32eefcf9d

Former-commit-id: e62c5a7062763c968556043812002aa3005f1df9
2015-07-13 11:09:23 -05:00
Ron Anderson
190049ee38 Omaha #4547 Fix more issues in extremeWindWarningFollowup.vm
Change-Id: I8b8ce5da4950c581f556b4f6a2744ec87aff8d52

Former-commit-id: 3058151ebcaeef7bd794d110ac28efd7144945ad
2015-07-13 09:33:30 -05:00
Fay.Liang
208bfc4b87 Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: de43ecb072da23016bd82cfa1a47924201c958f3
2015-07-10 15:16:15 -04:00
Juliya Dynina
983f61ba32 Merge "ASM #16925 added a fix so that synoptictoshef generates messages for zero reports" into asm_16.1.1
Former-commit-id: c321f5b6ce1e945527e6c21014abf783e2404630
2015-07-09 16:53:43 -05:00
Richard Peter
1384a95801 Merge "Omaha #4500 - Prevent SQL Injection" into omaha_16.1.1
Former-commit-id: a33743dd27c8ab201c00e440bbbd2a60180e845c
2015-07-09 16:52:27 -05:00
Brian Clements
c0623b9757 Omaha #4606 added missing style rule for 15min 20-40km grid pulse lightning
Change-Id: I23edfa536b772bf20da5ad479f93451f788647e6

Former-commit-id: 2fd6ac21caa17e5c6bbacefe04d6483fe7e5efb2
2015-07-09 16:08:49 -05:00
Richard Peter
85dcc9a835 Merge "Omaha #4298 - Ingest and display National Blend of Global Models" into omaha_16.1.1
Former-commit-id: c6355ce860377b29e994143296427a6a79d920fc
2015-07-09 15:30:57 -05:00
Richard Peter
badc21926a Omaha #4500 - Prevent SQL Injection
Change-Id: Ia61d5283ac60d01af892440218cb199365a3f79d

Former-commit-id: 70b8f0d02904abaf7633dfd131672f139f37dc8f
2015-07-09 14:36:47 -05:00
Loubna.Bousaidi
ffd65b6fe7 ASM #16925 added a fix so that synoptictoshef generates messages for zero reports
Change-Id: Ib6fd26b27285de0f63500683ed6e9176dafc723f

Former-commit-id: 9c4891a00d1b7f238798b3392b96dffd59703569
2015-07-09 19:00:41 +00:00
Ron Anderson
af0143f330 Omaha #4441 Fix QC issue with snowmelt in immediate cause
Change-Id: Iffbccdd1b8230ef118ea734395f8524b68f7aee5

Former-commit-id: 1c9dc2485b2aa52bbe73c7556f5714ff11ce82ef
2015-07-09 13:53:29 -05:00
Ron Anderson
284afa7ec7 Omaha #4547 Fix extremeWindWarning templates
Change-Id: I6ed8480751386ceafeabeaf0a675642f7d4046c6

Former-commit-id: f8105007f4c5c632458e6d6395cef93be737df44
2015-07-09 13:46:31 -05:00
Slav Korolev
be64094eb1 Omaha #4298 - Ingest and display National Blend of Global Models
Former-commit-id: 76dbde2807f370b87b3e7e28935d647899bd48b3
2015-07-09 13:33:15 -04:00