xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master_14.2.2' (14.2.2-26) into omaha_14.2.2

Browse source 
Former-commit-id: b4ac2e9c2c [formerly c5d804b092e56082337b80f717c6b2f3307fd9be]
Former-commit-id: 1839d53d2c
This commit is contained in:
Steve Harris 2014-08-13 14:50:49 -05:00
commit f23139ba39
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
View file

@ -253,7 +253,7 @@ public class SatResource extends
initializeFirstFrame((SatelliteRecord) pdo);
} catch (VizException e) {
throw new IllegalStateException(
"Unable to initialize the satellite resource");
"Unable to initialize the satellite resource", e);
}
initialized = true;
}

2
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
View file

@ -125,6 +125,7 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
* 06/26/2014 3321 mpduff Fix ingestSwitchMap checks
* 07/10/2014 3370 mpduff Fix update/insert issue for riverstatus
* 07/14/2014 mpduff Fix data range checks
* 08/05/2014 15671 snaples Fixed check for posting when not found in ingestfilter and token is set for load_shef_ingest
* </pre>
*
* @author mduff
@ -2147,7 +2148,6 @@ public class PostShef {
ingestSwitchMap.put(key, ingestSwitch);
}
matchFound = ingestSwitchMap.containsKey(key);
ingestSwitch = ingestSwitchMap.get(key);
/*

2
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
View file

@ -33,7 +33,7 @@
<contourStyle>
<displayUnits>ft</displayUnits>
<contourLabeling labelSpacing="4" labelFormat="#">
<increment>50</increment>
<increment>1000</increment>
</contourLabeling>
</contourStyle>
</styleRule>

2
rpms/awips2.core/Installer.ldm/component.spec
View file

@ -9,7 +9,7 @@
Name: awips2-ldm
Summary: AWIPS II LDM Distribution
Version: %{_ldm_version}
Release: 14
Release: %{_component_version}.%{_component_release}
Group: AWIPSII
BuildRoot: /tmp
BuildArch: noarch