xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/edexOsgi/com.raytheon.edex.plugin.gfe
History
Exact
Michael James 4a4c2df792 Merge remote-tracking branch 'remotes/origin/unidata_16.2.2' into unidata_16.2.2-osx 
Conflicts:
	cave/build/alertviz/customTargets.xml
	cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/index.xml
	cave/com.raytheon.uf.viz.d2d.ui.upperair/plugin.xml
	cave/com.raytheon.uf.viz.dat.feature/feature.xml
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cm/AWIPS2_NWS/edex/gov.noaa.nws.ost.edex.plugin.binlightning/src/gov/noaa/nws/ost/edex/plugin/binlightning/BinLightningAESKey.java
	cm/AWIPS2_NWS/edex/gov.noaa.nws.ost.edex.plugin.binlightning/src/gov/noaa/nws/ost/edex/plugin/binlightning/BinLightningAESKey.properties
	edexOsgi/build.edex/deploy.edex.awips2/.project
	edexOsgi/build.edex/deploy.edex.awips2/.pydevproject
	edexOsgi/build.edex/esb/etc/centralRegistry.sh
	edexOsgi/build.edex/esb/etc/dataprovideragent.sh
	edexOsgi/com.raytheon.edex.plugin.binlightning/utility/edex_static/base/distribution/binlightning.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satFog.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satMoisture.xml
	edexOsgi/com.raytheon.uf.edex.binlightning.feature/.project
	rpms/awips2.core/Installer.localization/utility/cave_static/bundles/scales/States.xml
2016-11-01 13:21:00 -06:00
..
META-INF RequiredExecutionEnvironment: JavaSE-1.7 2016-02-03 21:45:47 -06:00
res/spring gfe-request svcBackup should warn and not error 2016-10-17 19:37:43 -05:00
resources Omaha #4103: Update GFE service backup server code to support multiple service backup sites, use "smarter" lock files to store additional status. 2015-03-19 16:13:56 -05:00
src/com/raytheon/edex/plugin/gfe Omaha #5703 - Allow null or empty requestedSiteIDs for GetSiteTimeZoneInfoRequest. 2016-06-17 11:14:01 -05:00
utility Merge remote-tracking branch 'remotes/origin/unidata_16.2.2' into unidata_16.2.2-osx 2016-11-01 13:21:00 -06:00
.classpath
.project
.pydevproject
build.properties Merge tag 'OB_15.1.1-16' into omaha_16.1.1 2015-06-05 15:38:00 -05:00
com.raytheon.edex.plugin.gfe.ecl
plugin-deploy.groovy