Commit graph

4431 commits

Author SHA1 Message Date
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
Roger Ferrel
80c5050404 Omaha #4360 AbstractWarning's etn value now initialized to a non-null value.
Former-commit-id: 6c56abd9f6928b4cc8e3528ea29e418c6e1c416d
2015-07-31 09:06:17 -05:00
Fay.Liang
e0b8b2f813 Merge remote-tracking branch 'origin/master_14.4.2' into master_15.1.1
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java

Former-commit-id: 39babf90e69c4b8d3319cc385bb6a19bb3f93aad
2015-07-31 09:56:36 -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
Roger Ferrel
91838d136e Omaha #4360 Table changes for embedded AircraftObsLocation.
Former-commit-id: 610780fae04683ac8763789ac9dfad882896f29b
2015-07-30 12:57:36 -05:00
Roger Ferrel
6e0b8fca6a Omaha #4360 DataURI updated for tables derived from AbstractWarningRecord.
Former-commit-id: 6f9c0267f5aad993db4e4d6a3449561dcc6e64d5
2015-07-29 14:58:16 -05:00
Roger Ferrel
eeedba3a2f Omaha #4360 Remaining tables with embedded SurfaceObsLocation.
Change-Id: Id1104e8c8328f2e96cddd1b6cc97fc80e6c9c02f

Former-commit-id: b5aeaf07af9cd52cd5e99d4f7bf5458ad3bf1510
2015-07-29 12:15:42 -05:00
Richard Peter
713e3d1567 Merge "Omaha #4360 DataURI updates from table derived from NPPSoundingRecord." into omaha_16.2.1
Former-commit-id: a372093e1378b8cd90bb7257477e5ee7956ade6c
2015-07-28 17:53:14 -05:00
Richard Peter
ed452bf9d1 Merge "Omaha #4264 fix numpy.where in grib decode for f32" into omaha_16.2.1
Former-commit-id: d1b4a60ea7ea0c7a218c5acf91f3911850b28ef2
2015-07-28 16:26:03 -05:00
Nate Jensen
60a5945021 Omaha #4264 fix numpy.where in grib decode for f32
Change-Id: I0250b5ac67ab6270de1546b3446fa3896b7d2494

Former-commit-id: 6ff21b00c096edfd34edf08b6e9e69d7c9520351
2015-07-28 16:17:09 -05:00
Dave Hladky
9aa69c1379 Omaha #4670 return null when processing fails.
Former-commit-id: 99e232362cf9d555aefc3d2396593e9432a71488
2015-07-28 14:28:30 -05:00
Roger Ferrel
e98bdf1e38 Omaha #4360 DataURI updates from table derived from NPPSoundingRecord.
Former-commit-id: 258735aec01886b80a99a6c1307f5bb5d8f2ffd6
2015-07-28 10:30:06 -05:00
Roger Ferrel
ff10705d68 Omaha #4360 Tables with just naming of Unique Constraints.
Former-commit-id: f1789a6f5a058afdc05466ff5f2f037c6d2f1623
2015-07-27 14:59:04 -05:00
Roger Ferrel
2697fb05fa Omaha #4360 DataURI changes for table bufrmos_location and bufrmos tables and script cleanup.
Change-Id: Iea9bd9b932f291f20fd0cae1d68c903d1197bf37

Former-commit-id: d1bdaad7d7adac5d9b6373d621b83c3104560d5e
2015-07-27 11:19:36 -05:00
Sarah Pontius
0a500a18a7 VLab Issue #9414 - GFE Formatter: Storm surge forecast can differ significantly from Threat and potential impacts provided in TCV; fixes #9414
Change-Id: Ia1ad56f5043f4a153fdc35398637ab308ced6778

Former-commit-id: ba08dcdc83ea47b16e641b9c2ab70d7bb0a7ae93
2015-07-24 10:23:48 -06:00
Richard Peter
112d86f71c Merge "Omaha #4360 DataURI updates for table qc." into omaha_16.2.1
Former-commit-id: be2ddab0c78cbc6a9eb9eb00685c814d7064a7e0
2015-07-22 14:43:21 -05:00
Melissa Porricel
b93eda8a79 ASM #17615 - Fix model run precip accum display when time steps differ
Change-Id: I36614b97e4ed0b9008e67731da2d426dcca7d8c7

Former-commit-id: 8e718bed73542d0d2ae900eabe2862dcc8626656
2015-07-22 15:12:45 -04:00
Richard Peter
267d838073 Merge "Omaha #4360 DataURI changes for table acarssounding." into omaha_16.2.1
Former-commit-id: e51911dfeb65c6cdcb342ae4107a9f3f320b706d
2015-07-22 09:10:37 -05:00
Richard Peter
65db428cfa Merge "Omaha #4360 DataURI changes for table vaa." into omaha_16.2.1
Former-commit-id: 7e14a06e81a6a9523d4244dabf3f79279542d15f
2015-07-22 09:09:18 -05:00
Steve Harris
b36e10b33e Merge branch 'omaha_16.1.1' into omaha_16.2.1
Former-commit-id: b7c8b89efdfc63fb24117a985723e7a09c900eeb
2015-07-22 07:51:43 -05:00
Roger Ferrel
a23c66eaf0 Omaha #4360 DataURI changes for table acarssounding.
Former-commit-id: c626de1d9fed397fd1c2d9bf186be8d2d2b61b07
2015-07-21 15:38:52 -05:00
Roger Ferrel
a903053626 Omaha #4360 DataURI changes for table vaa.
Former-commit-id: 0d90852b40325216cf3300787e4a7c9a426c12fe
2015-07-21 14:09:04 -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
Richard Peter
c3aa196631 Merge "Omaha #4360 - DataURI changes for table poessounding." into omaha_16.2.1
Former-commit-id: 6d211cd9f73f4a7360d02ab42333ee6ef2392799
2015-07-21 12:56:37 -05:00
Richard Peter
f9be09fa46 Merge "Omaha #4360 DataURI changes for table madis." into omaha_16.2.1
Former-commit-id: 0a3eda442c9e6ed3566651d86b6b7e8f4cf8ba52
2015-07-21 12:56:31 -05:00
Richard Peter
a0db042c39 Merge "Omaha #4360 DataURI changes for table lsr." into omaha_16.2.1
Former-commit-id: 70c6828eeadfc01de26600ab21e6dce49a4e0fd2
2015-07-21 12:56:26 -05:00
Richard Peter
fd2be4db72 Merge "Omaha #4360 Changes for table ldadmesonet" into omaha_16.2.1
Former-commit-id: 118d68ef800e5fe1d86a6e070b4b6323025dee23
2015-07-21 12:56:17 -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
Roger Ferrel
f6e543edbd Omaha #4360 DataURI updates for table qc.
Former-commit-id: 7b2e4b080609776909050022b2e2292f0fddd67e
2015-07-21 09:35:01 -05:00
Roger Ferrel
03a6ebc0fe Omaha #4360 - DataURI changes for table poessounding.
Former-commit-id: 347dd9877808a6f1a3a159c6285a2332b6c4f81f
2015-07-21 09:11:13 -05:00
Roger Ferrel
9fe8a715de Omaha #4360 DataURI changes for ccfp and script cleanup.
Change-Id: I192d1f09d91c7bb41386d70bd2ddc080e000d849

Former-commit-id: cf041ee683b38aa9611e98caf79772c8006b2423
2015-07-21 08:08:57 -05:00
Roger Ferrel
f8a23c43df Omaha #4360 DataURI changes for table madis.
Former-commit-id: eeb5cc61ec80cc3685507ed952a6ce069ad0f189
2015-07-21 08:07:42 -05:00
Roger Ferrel
be677f56be Omaha #4360 DataURI changes for table lsr.
Former-commit-id: 4c57fd6dbe81b61c8a3dbedd637a97c69908c41f
2015-07-21 07:07:27 -05:00
Roger Ferrel
7cd9d97112 Omaha #4360 Changes for table ldadmesonet
Former-commit-id: 132a94d3f514cd148f33fe45727e0bd646490470
2015-07-20 16:25:59 -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
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
Steve Harris
c7f3b95cb4 Merge branch 'omaha_16.1.1' into omaha_16.2.1
Former-commit-id: 91c5e8113bfefcf252121539ba8f3777a9012439
2015-07-20 09:10:12 -05: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
Roger Ferrel
64e11f5a8e Omaha #4360 DataURI changes for table goessounding.
Former-commit-id: 6dd0bca70866f03980e3b8ff34a37347bd322f92
2015-07-17 13:47:25 -05:00
Richard Peter
c489e96c58 Merge "Omaha #4360 DataURI changes for table bufrssmi." into omaha_16.2.1
Former-commit-id: c9cdcebb25e351dba9603741420569b21fa8a0ed
2015-07-17 13:37:03 -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
Roger Ferrel
bb9a9c73f8 Omaha #4360 DataURI changes for table bufrssmi.
Change-Id: I8e2939fd6bbe5dae688418377a74a2d87414a6fb

Former-commit-id: f3812e5ac433d9652986ecfafbae631edbb1eb81
2015-07-17 12:37:54 -05:00
Roger Ferrel
024072ec00 Omaha #4360 DataURI changes for table bufrmthdw.
Change-Id: I4ad469dae3333d0f8a6af48166eb21d178bcaa44

Former-commit-id: c5a116ca64680308fe0be3d7b5f3dd03013ecfe7
2015-07-17 12:29:29 -05:00
Ben Steffensmeier
a61dd07581 Merge "Omaha #4360 Name unique constraints on BufrMosData derived classes." into omaha_16.2.1
Former-commit-id: ba7d9fd95236ec725081e68f24a583f2e0ff2cdb
2015-07-17 11:44:17 -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