xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
242 commits 31 branches 40 tags 3.8 GiB
Commit graph

7 commits

Author SHA1 Message Date
Steve Harris
31b3e87ffa Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java

All of these were 'self-resolved' when kdiff3 invoked


Former-commit-id: f98354aae305ad227eaf3b36e4393b8aefc80f02
 2012-05-09 13:19:47 -05:00
Steve Harris
2a216f333c 12.4.1-4 baseline 
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
 2012-04-18 15:18:16 -05:00
Steve Harris
fee53dea94 Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge 
Conflicts:
	edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java

Former-commit-id: 3bd9b3a16b0105822983302efa5dd2834aaf5a5f
 2012-04-10 12:50:03 -05:00
Steve Harris
22bd792cd9 12.3.1-10 baseline 
Former-commit-id: 7d62bca046401a670ef7bd917cbcbb073e061b60
 2012-03-30 08:38:33 -05:00
James Korman
217d384449 Issue #14 - Modified SHEF decoder components to respect the 
ALLOW_ARCHIVE_DATA "flag"

Former-commit-id: 6edc7e3bbb8e2cf9ca3bea809308bfd760e3f799
 2012-01-25 16:35:23 -06:00
Matt Nash
c83e5ff474 Moving 12.1.1 into ss_sync 
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
 2012-01-19 11:53:12 -06:00
root
06a8b51d6d Initial revision of AWIPS2 11.9.0-7p5 
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
 2012-01-06 08:55:05 -06:00