Merge "Omaha #3300 Merge conflict resolution with old Vbsources.xml." into omaha_14.4.1

Former-commit-id: fa15d4ff21 [formerly 157588d388b9033424ddc46a22d74ccc302eea85]
Former-commit-id: e8bc97501b
This commit is contained in:
Richard Peter 2014-10-08 12:02:17 -05:00 committed by Gerrit Code Review
commit 04bf8666b3
2 changed files with 19 additions and 2 deletions

View file

@ -24,6 +24,7 @@
<vbSource key="AK-NamDNG5" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="AK-NICICE" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="AK-RTMA" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="AK-RTMA3" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="AKWAVE239" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="AKwave10" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="AKwave4" category="SfcGrid" views="PLANVIEW TIMESERIES" />
@ -37,6 +38,7 @@
<vbSource key="EPwave10" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="estofsUS" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="estofsPR" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="GFE" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="GFS199" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="GFSGuide" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="GFSLAMPTstorm" name="GFSLAMP-Grid" category="SfcGrid"
@ -95,7 +97,7 @@
subCategory="Global" views="PLANVIEW TIMESERIES" />
<vbSource key="RTOFS-GulfAlaska" category="SfcGrid/RTOFS/forecast"
subCategory="Global" views="PLANVIEW TIMESERIES" />
<vbSource key="RTOFS-Honolulu" category="SfcGrid/RTOFS/forecast"
<vbSource key="RTOFS-Honolulu" category="SfcGrid/RTOFS/forecast"
subCategory="Global" views="PLANVIEW TIMESERIES" />
<vbSource key="RTOFS-HudsonBaffin" category="SfcGrid/RTOFS/forecast"
subCategory="Global" views="PLANVIEW TIMESERIES" />

View file

@ -43,6 +43,21 @@
<vbSource key="GEFS" category="Volume" />
<vbSource key="ENSEMBLE" category="Volume" views="PLANVIEW TIMESERIES" />
<vbSource key="AVN-NorthernHemisphere" category="Volume" />
<vbSource key="HFR-EAST_6KM" category="Volume" views="PLANVIEW TIMESERIES" />
<vbSource key="HFR-US_EAST_DELAWARE_1KM" category="Volume" views="PLANVIEW TIMESERIES" />
<vbSource key="HFR-US_EAST_FLORIDA_2KM" category="Volume" views="PLANVIEW TIMESERIES" />
<vbSource key="HFR-US_EAST_NORTH_2KM" category="Volume" views="PLANVIEW TIMESERIES" />
<vbSource key="HFR-US_EAST_SOUTH_2KM" category="Volume" views="PLANVIEW TIMESERIES" />
<vbSource key="HFR-US_EAST_VIRGINIA_1KM" category="Volume" views="PLANVIEW TIMESERIES" />
<vbSource key="HFR-US_HAWAII_1KM" category="Volume" views="PLANVIEW TIMESERIES" />
<vbSource key="HFR-US_HAWAII_2KM" category="Volume" views="PLANVIEW TIMESERIES" />
<vbSource key="HFR-WEST_6KM" category="Volume" views="PLANVIEW TIMESERIES" />
<vbSource key="HFR-US_WEST_CENCAL_2KM" category="Volume" views="PLANVIEW TIMESERIES" />
<vbSource key="HFR-US_WEST_NORTH_2KM" category="Volume" views="PLANVIEW TIMESERIES" />
<vbSource key="HFR-US_WEST_SANFRAN_1KM" category="Volume" views="PLANVIEW TIMESERIES" />
<vbSource key="HFR-US_WEST_SOCAL_2KM" category="Volume" views="PLANVIEW TIMESERIES" />
<vbSource key="HFR-US_WEST_LOSANGELES_1KM" category="Volume" views="PLANVIEW TIMESERIES" />
<vbSource key="HFR-US_WEST_LOSOSOS_1KM" category="Volume" views="PLANVIEW TIMESERIES" />
<vbSource key="HiResW-ARW-AK" category="Volume" />
<vbSource key="HiResW-ARW-East" category="Volume" />
<vbSource key="HiResW-ARW-GU" category="Volume" />
@ -64,7 +79,6 @@
<vbSource key="ETA" category="Volume" />
<vbSource key="ETA207" category="Volume" />
<vbSource key="NOGAPS" category="Volume" />
<vbSource key="radar" name="Radar" category="Volume" />
<vbSource key="RUC130" category="Volume" />
<vbSource key="RAP200" category="Volume" />
<vbSource key="RUC236" category="Volume" />
@ -74,4 +88,5 @@
<vbSource key="GFS161" category="Volume" />
<vbSource key="SREF212" category="Volume" views="PLANVIEW TIMESERIES" />
<vbSource key="UKMET-NorthernHemisphere" category="Volume" />
<vbSource key="radar" name="Radar" category="Volume" />
</vbSourceList>