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

1985 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steve Harris
83c025b715 Merge branch 'omaha_13.2.1' (13.2.1-7) into development 
Conflicts resolved by 'ours' strategy (all of development)

Conflicts:
	cave/build/p2-build.xml
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/legend/SetTimeMatchBasisAction.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/bandwidth/ui/GraphDataUtil.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/browser/ArealSelectionDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/AreaComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/IDataLoad.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionDiff.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/utils/DataDeliveryUtils.java
	cave/com.raytheon.uf.viz.gisdatastore/src/com/raytheon/uf/viz/gisdatastore/actions/DisplayAttributes.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/BasinTrendDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResourceData.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.plugin.nwsauth/src/com/raytheon/uf/viz/plugin/nwsauth/NwsRoleDataManager.java
	cave/com.raytheon.uf.viz.stats/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureJob.java
	cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMonitorDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/alertalarm/AlertAlarmValuesDlg.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/DisplayMeanArealPrecipResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/TimeLapseResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/XmrgResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/FipsUtil.java
	cots/net.dods/.classpath
	cots/net.dods/src/dods/dap/DAS.java
	cots/net.dods/src/dods/dap/DConnect.java
	cots/net.dods/src/dods/dap/DDS.java
	cots/net.dods/src/dods/dap/DataDDS.java
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/paraminfo/GridParamInfo.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/paraminfo/GridParamInfoLookup.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/paraminfo/ParameterInfo.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/AKwave10.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/AKwave4.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/AWCicgturb.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/AkNamDNG5.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/CPCoutlook211.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/CPCoutlookMedium.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/CPCoutlookMedium_AK.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/CPCoutlookShort.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/CPCoutlookShort_AK.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/EPwave10.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/GRLKwave.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/GlobalWave.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HIrtmaNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HPCqpfNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiNamDNG5.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-arwAK.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-arwEast.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-arwHI.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-arwSJU.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-arwWest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-nmmAK.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-nmmEast.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-nmmHI.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-nmmSJU.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-nmmWest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/NamDNG5.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/PRrtmaNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/PrNamDNG5.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCtcm175.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCtcm226.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCtcm250.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/WCwave10.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/WCwave4.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/WNAwave10.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/WNAwave4.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/aKrtmaNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/aiv211.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/akWave239.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avn201.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avn202.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avn203.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avn211.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avn213.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avn225.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avnGBL.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avnNH.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/dgex185.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/dgex186.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ecmfGBL.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ecmfNH.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ecmwf.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/enpWave253.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ensembleGBL.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ensembleNH.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/eta207.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/eta211.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/eta212.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/eta218.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/eta242.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/fcst.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfe.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfs160.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfs161.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfs201.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfs212.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfs213.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfs254.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfsGuide232.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/glerl.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gww233.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/hpcDelta215.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/hpcGuideNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/hpc_qpf218.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/lampNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/laps.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/localBHPE.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/localDHM.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/localHPE.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/localMPE.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/maps.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/maps40.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mesoEta212.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mesoEta215.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mesoEta216.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mesoEta217.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mm5.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mosGuideNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mosGuideNDFD_AK.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mrf201.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mrf202.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mrf203.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mrf204.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mrf205.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mrf213.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/msas.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ngm202.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ngm207.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ngm211.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ngm213.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/nic218.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/nic242.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/nogaps.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/opcWave180.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/opcWave181.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/opcWave182.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/qpf218.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rfcMPE.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/roc_rams.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rsmMerc10km.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rtgsst235.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rtgssthr173.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rtmaNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ruc130.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ruc211.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ruc236.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/seaIce219.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/sfm.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/spcGuideNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/sref212.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/sref216.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/sref243.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/tpcWind231.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/turb212.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ukmetGBL.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ukmetNH.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/wnaWave238.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/MetarToShefFilter.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/DataFactoryRegistry.java
	edexOsgi/com.raytheon.uf.common.datadelivery.event/src/com/raytheon/uf/common/datadelivery/event/retrieval/DataRetrievalEvent.java
	edexOsgi/com.raytheon.uf.common.datadelivery.event/src/com/raytheon/uf/common/datadelivery/event/retrieval/SubscriptionRetrievalEvent.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/GriddedCoverage.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Subscription.java
	edexOsgi/com.raytheon.uf.common.datadelivery.request/src/com/raytheon/uf/common/datadelivery/request/user/AuthenticationData.java
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/xml/LevelLookup.java
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/xml/Retrieval.java
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/xml/RetrievalAttribute.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPAggregateRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasin.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPGuidanceBasin.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/util/GeometryUtil.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/EnvelopeIntersection.java
	edexOsgi/com.raytheon.uf.common.hydro/res/spring/hydro-common.xml
	edexOsgi/com.raytheon.uf.common.hydro/src/com/raytheon/uf/common/hydro/dataaccess/HydroGeometryFactory.java
	edexOsgi/com.raytheon.uf.common.hydro/src/com/raytheon/uf/common/hydro/dataaccess/HydroQueryAssembler.java
	edexOsgi/com.raytheon.uf.common.image/component-deploy.xml
	edexOsgi/com.raytheon.uf.common.pypies/src/com/raytheon/uf/common/pypies/PyPiesDataStore.java
	edexOsgi/com.raytheon.uf.common.python/src/com/raytheon/uf/common/python/PythonNumpyFloatArray.java
	edexOsgi/com.raytheon.uf.common.registry.ebxml/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.registry.event/src/com/raytheon/uf/common/registry/event/RegistryStatisticsEvent.java
	edexOsgi/com.raytheon.uf.common.registry.event/src/com/raytheon/uf/common/registry/event/UpdateRegistryEvent.java
	edexOsgi/com.raytheon.uf.common.registry.schemas.ebxml/src/oasis/names/tc/ebxml/regrep/xsd/lcm/v4/package-info.java
	edexOsgi/com.raytheon.uf.common.stats/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.cpgsrv/src/com/raytheon/uf/edex/cpgsrv/CompositeProductGenerator.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/thrift-bandwidth.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthGraphDataAdapter.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthContextFactory.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/IBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/InMemoryBandwidthDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/dao/BandwidthAllocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/dao/IBandwidthDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/dao/SubscriptionRetrieval.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/hibernate/HibernateBandwidthDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/hibernate/HibernateBandwidthDbInit.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/hibernate/HibernateBandwidthInitializer.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/interfaces/ISubscriptionAggregator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/notification/BandwidthAsyncEventBusFactory.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/notification/BandwidthEventBus.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/processing/SimpleSubscriptionAggregator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/retrieval/RetrievalAgentManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/retrieval/RetrievalManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/retrieval/RetrievalPlan.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/retrieval/SubscriptionRetrievalAgent.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/AveragingAvailablityCalculator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.event/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.datadelivery.event/src/com/raytheon/uf/edex/datadelivery/event/handler/NotificationHandler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/src/com/raytheon/uf/edex/datadelivery/harvester/CrawlMetaDataHandler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/.classpath
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/RetrievalGenerationHandler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/ServiceTypeFactory.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/adapters/RetrievalAdapter.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalRequestRecord.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalRequestRecordPK.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/handlers/RetrievalHandler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/handlers/RetrievalTask.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/handlers/SubscriptionNotifyTask.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/interfaces/IRetrievalAdapter.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/interfaces/IRetrievalResponse.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/metadata/adapters/GridMetadataAdapter.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPRetrievalAdapter.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDapServiceFactory.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/response/OpenDAPTranslator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/response/RetrievalResponse.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/response/RetrievalTranslator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/ResponseProcessingUtilities.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/verify/BaseSubscriptionVerifier.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/verify/NotifyFailedVerification.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/verify/SubscriptionIntegrityVerifier.java
	edexOsgi/com.raytheon.uf.edex.event/src/com/raytheon/uf/edex/event/EventBus.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/topo/StaticTopoData.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/topo/TopoAttributes.java
	edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/MpeLightningSrv.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPInterpolatedGuidanceDelay.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTI.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-common.xml
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-impl.xml
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client.xml
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-web.xml
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml.xml
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/acp/xacml/engine/function/impl/DoubleMultiply.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/acp/xacml/engine/function/impl/package-info.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/util/RegistrySessionContext.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/util/RegistrySessionManager.java
	edexOsgi/com.raytheon.uf.edex.stats/utility/edex_static/base/stats/edexProcessStats.xml
	nativeLib/org.apache.qpid/include/qpid/types/Exception.h
	nativeLib/org.apache.qpid/lib/libqpidclient.so.4.0.0
	nativeLib/org.apache.qpid/lib/libqpidcommon.so.4.0.0
	nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3.0.2
	nativeLib/org.apache.qpid/lib/libqpidtypes.so.1.1.1
	nativeLib/org.apache.qpid/lib64/libqpidclient.so
	nativeLib/org.apache.qpid/lib64/libqpidclient.so.4
	nativeLib/org.apache.qpid/lib64/libqpidclient.so.4.0.0
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so.4
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so.4.0.0
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so.3
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so.3.0.2
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so.1
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so.1.1.1
	nativeLib/org.apache.thrift/lib/libthrift.so
	nativeLib/org.apache.thrift/lib/libthriftz.so
	nativeLib/org.apache.thrift/lib64/libthrift.so
	nativeLib/org.apache.thrift/lib64/libthrift.so.0
	nativeLib/org.apache.thrift/lib64/libthrift.so.0.0.0
	nativeLib/org.apache.thrift/lib64/libthriftz.so
	nativeLib/org.apache.thrift/lib64/libthriftz.so.0
	nativeLib/org.apache.thrift/lib64/libthriftz.so.0.0.0
	ncep/gov.noaa.nws.ncep.viz.gempak/localization/ncep/GempakGridUnits/gempakGridVcrdUnits.xml
	pythonPackages/pypies/pypies/impl/H5pyDataStore.py
	tests/.classpath
	tests/integration/com/raytheon/uf/edex/datadelivery/bandwidth/AbstractBandwidthManagerIntTest.java
	tests/integration/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManagerIntTest.java
	tests/integration/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthServiceIntTest.java
	tests/integration/com/raytheon/uf/edex/datadelivery/bandwidth/IntegrationTestBandwidthContextFactory.java
	tests/resources/bandwidth/bandwidth-datadelivery-integrationtest-impl.xml
	tests/resources/unit-test-db-beans.xml
	tests/resources/unit-test-hibernate.cfg.xml
	tests/unit/com/raytheon/uf/common/datadelivery/registry/BaseSubscriptionFixture.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/DataSetMetaDataTest.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/LevelsFixture.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/ParameterFixture.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/ProviderFixture.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/SubscriptionBuilder.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/TimeFixture.java
	tests/unit/com/raytheon/uf/common/serialization/SerializationUtilTest.java
	tests/unit/com/raytheon/uf/common/time/SimulatedTimeTest.java
	tests/unit/com/raytheon/uf/common/util/Matchers.java
	tests/unit/com/raytheon/uf/common/util/session/SessionManagerTest.java
	tests/unit/com/raytheon/uf/edex/database/dao/DatabaseUtil.java
	tests/unit/com/raytheon/uf/edex/datadelivery/bandwidth/AbstractBandwidthDaoTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/bandwidth/HibernateBandwidthDaoTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/bandwidth/dao/DataSetMetaDataDaoFixture.java
	tests/unit/com/raytheon/uf/edex/datadelivery/bandwidth/dao/SubscriptionDaoFixture.java
	tests/unit/com/raytheon/uf/edex/datadelivery/bandwidth/dao/SubscriptionRetrievalFixture.java
	tests/unit/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtilTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/retrieval/handlers/RetrievalHandlerTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPMetaDataParserNCOMTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPMetaDataParserRAPTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPParseUtilityTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/service/verify/SubscriptionIntegrityVerifierTest.java
	tests/unit/com/raytheon/uf/edex/stats/MockEvent.java

Former-commit-id: e0a0e0df3c [formerly b96a90bdbd] [formerly e0a0e0df3c [formerly b96a90bdbd] [formerly 16db86df12 [formerly f3c152674265b2142e61a306c3f4815b02000e1d]]]
Former-commit-id: 16db86df12
Former-commit-id: abbb5ad21c [formerly 6ba2455892]
Former-commit-id: 4cafa4985b
 2013-02-19 12:20:06 -06:00
Dustin Johnson
0f1fcc9b5b Issue #1543 Add ncfRegistry and wfoRegistry to runtime modes 
Amend:
   Use ref syntax with uri.

Change-Id: Idab7b0e23909b8fb30defa5453fa52f37952d062

Former-commit-id: 2a588688b1 [formerly cc598094fa] [formerly 2a588688b1 [formerly cc598094fa] [formerly 116809346b [formerly 66fe560026848357ae165a675be9818da719675d]]]
Former-commit-id: 116809346b
Former-commit-id: 5ff6387368 [formerly 3585482cad]
Former-commit-id: 992a02d000
 2013-02-18 15:47:17 -06:00
Richard Peter
33aa90c3de Merge "Issue #1598 Make GridParamInfoLookup filter on extension. Change-Id: I6f045d8cdd7233b767f5403e56ec364737d73744" into development 
Former-commit-id: 83d12549bf [formerly 77157e3c6c] [formerly 83d12549bf [formerly 77157e3c6c] [formerly f364af584d [formerly 7b223be1a91cd67792d43865514867e6a12dfa7f]]]
Former-commit-id: f364af584d
Former-commit-id: d42a0b9f0d [formerly 623020926e]
Former-commit-id: 3b1a6d4c30
 2013-02-18 15:36:41 -06:00
Dustin Johnson
0a958fb225 Merge "Issue #1543 Use XML to represent retrieval - Only include request identifier for serialized retrieval data - RetrievalAttributes are now retrieved from the database - Remove plugin data objects from class names - Add retrievalDao to retrieval task constructor" into development 
Former-commit-id: c1e20611d5 [formerly 7392aab40c] [formerly c1e20611d5 [formerly 7392aab40c] [formerly de8e371471 [formerly e2b704d27ce7b4d9e2d3ac86ef5081eeb844d96c]]]
Former-commit-id: de8e371471
Former-commit-id: 73620cf82f [formerly 0cf2c65afa]
Former-commit-id: 1ddd1de10a
 2013-02-18 13:20:53 -06:00
Dustin Johnson
191ec3b408 Issue #1543 Use XML to represent retrieval 
- Only include request identifier for serialized retrieval data
- RetrievalAttributes are now retrieved from the database
- Remove plugin data objects from class names
- Add retrievalDao to retrieval task constructor

Amend:
   Add call-through method to prepare for serialization.

Change-Id: Ic5d2243dd77e1aefd49057a0b7843329e95f0c9d

Former-commit-id: f16c1507d0 [formerly 437a168b50] [formerly f16c1507d0 [formerly 437a168b50] [formerly 62a84aea76 [formerly 2cd0aa465fe10282b4be9225011fa8c780204edb]]]
Former-commit-id: 62a84aea76
Former-commit-id: 6f94c035e8 [formerly db3a9d8f19]
Former-commit-id: f6257b20ea
 2013-02-18 13:05:41 -06:00
Roger Ferrel
2ad4fdd716 Issue #1633 Change to WarnGenDialog so the checkFollowupSelection method uses Simulated Time. 
Change-Id: I8d25084a88506f6e9bec72cfd40f02165d421869

Former-commit-id: a2e61d32a1 [formerly 1b693994a5] [formerly a2e61d32a1 [formerly 1b693994a5] [formerly 1d51a10f4b [formerly 011b0822a8942d6dc4307b0a422060d9a97c7f8d]]]
Former-commit-id: 1d51a10f4b
Former-commit-id: 94eb5757b5 [formerly 211a39c333]
Former-commit-id: 47c549c5e8
 2013-02-18 12:15:39 -06:00
Ben Steffensmeier
bc3be10852 Issue #1598 Make GridParamInfoLookup filter on extension. 
Change-Id: I6f045d8cdd7233b767f5403e56ec364737d73744

Former-commit-id: efc1335b1f [formerly 63a725718d] [formerly efc1335b1f [formerly 63a725718d] [formerly d2e17d1473 [formerly f89bef237373fd2c7f6bb5b7490ee6aa63d2040b]]]
Former-commit-id: d2e17d1473
Former-commit-id: 47090eccc1 [formerly 5ada0b2c2a]
Former-commit-id: d472a5d48e
 2013-02-18 10:36:47 -06:00
Richard Peter
a84328c00d Merge "Issue #1630 updated chunk size for single dimension chunks." into development 
Former-commit-id: 3ad71676b3 [formerly 6beaa1e8ae] [formerly 3ad71676b3 [formerly 6beaa1e8ae] [formerly 14c2a2b201 [formerly 010d73f684ec58affd0aeffcef64c6904f909bef]]]
Former-commit-id: 14c2a2b201
Former-commit-id: 13cb57b378 [formerly 0a47749664]
Former-commit-id: a5e4f70474
 2013-02-18 09:44:36 -06:00
Richard Peter
1015d581cb Merge "Issue #1584 - FFMP performance stats and performance logger Peer review comments Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c" into development 
Former-commit-id: 3c126b0ab1 [formerly 355e6d2c67] [formerly 3c126b0ab1 [formerly 355e6d2c67] [formerly 4fb1cb27dc [formerly a07a434ad71986aa4b474dd88e266035e347efa4]]]
Former-commit-id: 4fb1cb27dc
Former-commit-id: 4f3d9ab931 [formerly 8991c1c86d]
Former-commit-id: 17dfe3e7fa
 2013-02-18 09:35:53 -06:00
Brad Gonzales
79b1560c07 Issue #1630 updated chunk size for single dimension chunks. 
Amend: check if dataType is vlen_str_type.

Change-Id: Idbd39e8bcd6c2703299277b073e14b106c897ccb

Former-commit-id: f8b4dcc541 [formerly 4c706901f8] [formerly f8b4dcc541 [formerly 4c706901f8] [formerly 691b9d7ca2 [formerly 25bd6d76b85b3c857958f1fc5189f9512420daea]]]
Former-commit-id: 691b9d7ca2
Former-commit-id: 1ce25acbc5 [formerly b9b660535c]
Former-commit-id: b8147737fe
 2013-02-18 09:29:21 -06:00
Nate Jensen
92148eca41 Merge "Issue #1614 Cache LatLonReprojection results. Change-Id: If1a8499fbb6a06bad41867078da3e957738f4338" into development 
Former-commit-id: eb8e87dfe2 [formerly 88b665c09a] [formerly eb8e87dfe2 [formerly 88b665c09a] [formerly 52a0673961 [formerly cb57fe31471693b2f3398d0c6bd97af36410d9b8]]]
Former-commit-id: 52a0673961
Former-commit-id: d39e16e532 [formerly d648e77fa5]
Former-commit-id: f41ef80162
 2013-02-18 09:07:18 -06:00
Ron Anderson
0ef1805569 Merge "Issue #1507: Improve responsiveness of menus that list smart tools or procedures by forcing UIControllers to be constructed at startup, not on demand." into development 
Former-commit-id: cf0fc8d921 [formerly e70cfc5825] [formerly cf0fc8d921 [formerly e70cfc5825] [formerly a6d87cdd7e [formerly a1e38ed2f2da79028b04589a548b16543700f08f]]]
Former-commit-id: a6d87cdd7e
Former-commit-id: 292614bc25 [formerly 999ac02aea]
Former-commit-id: 873a7075ae
 2013-02-18 08:31:50 -06:00
Mike Duff
2aee18ea9d Issue #1584 - FFMP performance stats and performance logger 
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c

Former-commit-id: 897262630c [formerly 0b044dba9c] [formerly 897262630c [formerly 0b044dba9c] [formerly 9c1e0ab639 [formerly 1334488810c13f02e692c234a52d8f0f505a5846]]]
Former-commit-id: 9c1e0ab639
Former-commit-id: 3e59308771 [formerly 079ec4b6dd]
Former-commit-id: 72f6e95a67
 2013-02-18 08:16:57 -06:00
Richard Peter
3b53668cbe Merge "Issue #1506 move away from using QueryScript on the UI thread, except where absolutely necessary we can run a synchronous operation" into development 
Former-commit-id: 5bf0e0e999 [formerly 51533ccab2] [formerly 5bf0e0e999 [formerly 51533ccab2] [formerly 70f270ff16 [formerly 07f3be5e44386a8138556b0269d3e731c6e1ef5f]]]
Former-commit-id: 70f270ff16
Former-commit-id: 1b112227a8 [formerly 2299503559]
Former-commit-id: 73501955ff
 2013-02-15 16:40:04 -06:00
Richard Peter
107393f436 Merge "Issue #1608 Fixed group deletes in H5pyDataStore.py" into development 
Former-commit-id: b3e2ca7b30 [formerly a40ae4d8b2] [formerly b3e2ca7b30 [formerly a40ae4d8b2] [formerly a6fa92923f [formerly 46302aa76056b00ee6a21c8080274ba23d92dcda]]]
Former-commit-id: a6fa92923f
Former-commit-id: 774ea0ede6 [formerly 5936f671ce]
Former-commit-id: b5706ca6cf
 2013-02-15 16:33:00 -06:00
Ben Steffensmeier
3da1ee4eca Issue #1614 Cache LatLonReprojection results. 
Change-Id: If1a8499fbb6a06bad41867078da3e957738f4338

Former-commit-id: a10e7edaeb [formerly e53416937e] [formerly a10e7edaeb [formerly e53416937e] [formerly feb2e98e58 [formerly 2596b3105e377f0fb8713be502a41b4b2f470e93]]]
Former-commit-id: feb2e98e58
Former-commit-id: 5b1acfdeb3 [formerly 6b53511f9e]
Former-commit-id: 18d64138d3
 2013-02-15 14:24:22 -06:00
Brad Gonzales
b2e457022d Issue #1615 Changed radar header names to match other header names. 
Change-Id: I6b3be3028a1602ead03ec209e773db68bbfb665a

Former-commit-id: 1ddcd8b3a8 [formerly a9012633a1] [formerly 1ddcd8b3a8 [formerly a9012633a1] [formerly 961f51e91f [formerly b7f5d565bdfb8f1289f73837ffa9a54f2659d65c]]]
Former-commit-id: 961f51e91f
Former-commit-id: 1501ed6deb [formerly 0dda5f784e]
Former-commit-id: 36fdf25480
 2013-02-15 14:02:03 -06:00
David Gillingham
f21dbe9026 Issue #1507: Improve responsiveness of menus that list smart tools or procedures by forcing 
UIControllers to be constructed at startup, not on demand.

Change-Id: Ifb492171ac4720e36f68da082c38d31c1de08132

Former-commit-id: 9fae6695e2 [formerly 871364d630] [formerly 9fae6695e2 [formerly 871364d630] [formerly da091b723d [formerly 463af46e64ed667efbc840d85f9babf3449780cc]]]
Former-commit-id: da091b723d
Former-commit-id: cc05bdae4e [formerly 244bc9b270]
Former-commit-id: 345288aa13
 2013-02-15 12:50:48 -06:00
Jonathan Sanchez
3f13abe62a Issue #1624 Temporary fix for NullPointerException. 
Former-commit-id: 18dd00e488 [formerly f507d23fed] [formerly 18dd00e488 [formerly f507d23fed] [formerly fea6b44036 [formerly f95a402347ae45ad133206bfea796b240decf0a6]]]
Former-commit-id: fea6b44036
Former-commit-id: 763280dd53 [formerly 1486022395]
Former-commit-id: f948e7b5b6
 2013-02-15 12:31:21 -06:00
Lee Venable
3e7f56375b Merge "Issue #1607 Added time variables for CORs." into development 
Former-commit-id: 628d0d9840 [formerly d94233499a] [formerly 628d0d9840 [formerly d94233499a] [formerly 91e016aa34 [formerly 7a6200d4bfe21feb6e29603dd638876f50a66162]]]
Former-commit-id: 91e016aa34
Former-commit-id: 5ec5918e45 [formerly 38bbca4895]
Former-commit-id: 8b3c710869
 2013-02-15 12:08:15 -06:00
Nate Jensen
7bcb70160d Merge "Issue #1614 Refactor data access framework to use single request. Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798" into development 
Former-commit-id: 1b1e468e1f [formerly f748815e22] [formerly 1b1e468e1f [formerly f748815e22] [formerly f79f7db348 [formerly 55acd96d99a61170cbbc2b202e9562912b6fb0c3]]]
Former-commit-id: f79f7db348
Former-commit-id: d6ba283efc [formerly a60cf277bc]
Former-commit-id: 1501b0f1e3
 2013-02-15 11:56:11 -06:00
Ben Steffensmeier
e6fc131343 Issue #1614 Refactor data access framework to use single request. 
Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798

Former-commit-id: e771076275 [formerly 1393f3e3cf] [formerly e771076275 [formerly 1393f3e3cf] [formerly 0933a5f596 [formerly 5a9ae7df15633492b0d9fb648876cfb2bb2946b6]]]
Former-commit-id: 0933a5f596
Former-commit-id: 91bbdc3337 [formerly f0f3c71d50]
Former-commit-id: f868f66f76
 2013-02-15 11:39:56 -06:00
Jonathan Sanchez
f6244fb198 Issue #1607 Added time variables for CORs. 
Former-commit-id: 38802d3df8 [formerly 6d968dc09d] [formerly 38802d3df8 [formerly 6d968dc09d] [formerly 3025639923 [formerly 311f633ba47efcf3b13f77867e1fa32a584f3232]]]
Former-commit-id: 3025639923
Former-commit-id: 352d3dea5a [formerly bb797eeb74]
Former-commit-id: e7a2a2f99c
 2013-02-15 09:59:12 -06:00
Ron Anderson
80df624bb3 Issue #1608 Fixed group deletes in H5pyDataStore.py 
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a

Former-commit-id: dc7c9edb87 [formerly a2a89fb4e7] [formerly dc7c9edb87 [formerly a2a89fb4e7] [formerly 7c0a5d74bf [formerly dc9ac54903107224633b4e18d5caa345649d8266]]]
Former-commit-id: 7c0a5d74bf
Former-commit-id: d69d628450 [formerly e952a4f179]
Former-commit-id: 45627edcc7
 2013-02-15 09:03:41 -06:00
Richard Peter
1b8a4b159d Merge "Issue #1603 Fixed disappearing smartInit HDF5 files. Code cleanup and GFE performance logging." into development 
Former-commit-id: dcd4761b54 [formerly eb00310ef9] [formerly dcd4761b54 [formerly eb00310ef9] [formerly b54ec2b59e [formerly b3c7458333b9a8d0f011614c0b4845397e074ce8]]]
Former-commit-id: b54ec2b59e
Former-commit-id: ad4110a73f [formerly 0bab06709b]
Former-commit-id: b82e1249bd
 2013-02-15 08:44:02 -06:00
Richard Peter
424d5a62fd Merge "Issue #1615 Updated group name in common_static edexProcessStats.xml. Added delta script to update aggregate table group names from pluginName to dataType." into development 
Former-commit-id: bd91d2b8be [formerly 5a5a5ba855] [formerly bd91d2b8be [formerly 5a5a5ba855] [formerly d905313941 [formerly 7071c075ee2282b6048cafdefac6d6c83a344ca0]]]
Former-commit-id: d905313941
Former-commit-id: 015b51082d [formerly 2d8327e76f]
Former-commit-id: 8cac928d13
 2013-02-15 08:31:33 -06:00
Dustin Johnson
12d4b055f6 Issue #1596 Do not reschedule bandwidth allocations when a subscription is removed 
Change-Id: I4016034e6bdc5e8acf4936a0f786906611e7ad41

Former-commit-id: 4be6c12ac6 [formerly 714ea1c8d8] [formerly 4be6c12ac6 [formerly 714ea1c8d8] [formerly 6e2f69939f [formerly 5f87319abc3712667abc6b454f49882b0f3fb45f]]]
Former-commit-id: 6e2f69939f
Former-commit-id: d0ecd69456 [formerly 1ef440f8ee]
Former-commit-id: f14bedec28
 2013-02-15 08:13:11 -06:00
Dustin Johnson
9213ea18f2 Merge "Issue #1595 Fix expired subscription update retrieval time scheduling" into development 
Former-commit-id: 6ba5f0d03b [formerly d71773dbb4] [formerly 6ba5f0d03b [formerly d71773dbb4] [formerly f96d83110c [formerly 5ec93e8102bcd837650b4ae7725dceaa8bb61bfd]]]
Former-commit-id: f96d83110c
Former-commit-id: 0156736b85 [formerly 507c83f32a]
Former-commit-id: 4bb9f3eda7
 2013-02-15 08:08:49 -06:00
Brad Gonzales
3d92be6fc1 Issue #1615 Updated group name in common_static edexProcessStats.xml. Added delta script to update aggregate table group names from pluginName to dataType. 
Amend: Corrected comment in convertPluginNameToDataType.sh

Change-Id: I5e0084704cef599d368165058b8008bbb2bc8e18

Former-commit-id: 6a0e9c331b [formerly 03dd42463e] [formerly 6a0e9c331b [formerly 03dd42463e] [formerly dfef89ee64 [formerly a2391d76c91d3d2b86b8e74eed1e0754091650a0]]]
Former-commit-id: dfef89ee64
Former-commit-id: 936facbe86 [formerly e495a5f663]
Former-commit-id: 5e69b61418
 2013-02-14 17:34:55 -06:00
Nate Jensen
c2f53b312f Merge "Issue #1627 Sped up FFMp load by removing un-needed DB calls." into development 
Former-commit-id: be680f2523 [formerly 7cf29fbf39] [formerly be680f2523 [formerly 7cf29fbf39] [formerly 6d8b8dd774 [formerly c83110e509d662da0a4b1975bc1044fb7ffadb9e]]]
Former-commit-id: 6d8b8dd774
Former-commit-id: ebb3394719 [formerly 0ce3009528]
Former-commit-id: b9e978a6e2
 2013-02-14 16:39:23 -06:00
Dustin Johnson
4466e63c84 Issue #1595 Fix expired subscription update retrieval time scheduling 
Change-Id: I225bf887d03e43295f4b18eea677bb24c032b8a7

Former-commit-id: 54dd90afdd [formerly 656601f272] [formerly 54dd90afdd [formerly 656601f272] [formerly f6a286da2d [formerly 26dd90355f6ce2ed5c409a142622cf220754c2ab]]]
Former-commit-id: f6a286da2d
Former-commit-id: 158ce1fe5b [formerly 776581bc55]
Former-commit-id: 0614bd08f7
 2013-02-14 15:33:06 -06:00
Dave Hladky
8810b8e486 Issue #1627 Sped up FFMp load by removing un-needed DB calls. 
Change-Id: Ice81630bd72b7f64d6f0817d2e531877b0072956

Former-commit-id: 83fe9ca104 [formerly 8247da158f] [formerly 83fe9ca104 [formerly 8247da158f] [formerly a8f6635a6f [formerly db09538ad0664b8a7f3eb83f062a47490975f7b1]]]
Former-commit-id: a8f6635a6f
Former-commit-id: 7f6381ec5c [formerly 4cd9b2e8b2]
Former-commit-id: 7b723067a4
 2013-02-14 15:12:29 -06:00
Nate Jensen
498c622823 Merge "Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT" into development 
Former-commit-id: 5526ee7e8d [formerly 1144f08e59] [formerly 5526ee7e8d [formerly 1144f08e59] [formerly a3e0bf09ab [formerly a8fbe37f3f30721d7a14c653993758c1a9f2d2ad]]]
Former-commit-id: a3e0bf09ab
Former-commit-id: b4aea0385c [formerly 3f5b8b56ef]
Former-commit-id: 2422d17df3
 2013-02-14 15:05:14 -06:00
Dave Hladky
3dd2314369 Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT 
Change-Id: I693debea540667cfda6efe1496dd1084b8d0e950

Former-commit-id: 2655952304 [formerly 7b3a310f67] [formerly 2655952304 [formerly 7b3a310f67] [formerly 381aec5976 [formerly 2ea8409800917d8c9a4c76c3b63492a2eb1f2c62]]]
Former-commit-id: 381aec5976
Former-commit-id: a17dee033a [formerly 5c66cbcd27]
Former-commit-id: 7dad108a93
 2013-02-14 13:58:32 -06:00
Lee Venable
435285111b Merge "Issue #1605 Improved finding closest area locations. " into development 
Former-commit-id: 4383968e23 [formerly b047a0393f] [formerly 4383968e23 [formerly b047a0393f] [formerly 60f3f46d19 [formerly 1c778e9c7140214bed727a2eac73c0461d134341]]]
Former-commit-id: 60f3f46d19
Former-commit-id: dfef1c916a [formerly 4952a3f595]
Former-commit-id: 0ebc7317a2
 2013-02-14 12:56:01 -06:00
Matt Nash
2939e7ea25 Issue #1506 move away from using QueryScript on the UI thread, except where 
absolutely necessary we can run a synchronous operation

Change-Id: I4503d4e18e3f458b7df7c2d187e8880d5a3d2cc7

Former-commit-id: 75f51be7b2 [formerly bc954889eb] [formerly 75f51be7b2 [formerly bc954889eb] [formerly 5b136272a3 [formerly f6ef0f0ebc9002caad9a632515402b84280892fc]]]
Former-commit-id: 5b136272a3
Former-commit-id: 126537966c [formerly d29162c654]
Former-commit-id: c2d41ae6a2
 2013-02-14 11:47:34 -06:00
Ron Anderson
7203cc6531 Merge "Issue #1515: Better handle notifications received after disposing VCParms." into development 
Former-commit-id: 11212b51db [formerly e04322f7ad] [formerly 11212b51db [formerly e04322f7ad] [formerly 96fee6ea56 [formerly 1f5fbc207e533be5a7dde9651dd35743a0fc3a34]]]
Former-commit-id: 96fee6ea56
Former-commit-id: 377e85913f [formerly b5ff9b6998]
Former-commit-id: 0fd4810cfa
 2013-02-14 11:13:26 -06:00
Jonathan Sanchez
f60cb362f2 Issue #1605 Improved finding closest area locations. 
Former-commit-id: 4555420e82 [formerly 9641b67da4] [formerly 4555420e82 [formerly 9641b67da4] [formerly 1722713689 [formerly b8a43d95121a1876dc8136bd5758e9452167fad2]]]
Former-commit-id: 1722713689
Former-commit-id: c1a832ef3a [formerly 459472a793]
Former-commit-id: 73110463b1
 2013-02-14 11:12:23 -06:00
Ben Steffensmeier
2bcf3749ce Issue #1614 allow locationNames for grid data access 
Change-Id: I5d88708909b8f76ebdf6fac64a330854781ffae2

Former-commit-id: ef7addb005 [formerly ab319bd3a8] [formerly ef7addb005 [formerly ab319bd3a8] [formerly 9b4de367e3 [formerly 7fe101c9fdb9266cd7c16a6c0a7281b9f9836cc4]]]
Former-commit-id: 9b4de367e3
Former-commit-id: efaddb710c [formerly 0995024482]
Former-commit-id: aecc5a69e9
 2013-02-14 10:07:01 -06:00
Dustin Johnson
1d80262cf9 Issue #1543 Serialize DODS response rather than plugin data objects directly 
- Remove proxy classes for Spring transactions, use interfaces as Spring recommends.

Amend:
   Peer review comments.
   Set retrieval status to failed when payload is null.

Change-Id: I458b13856302c8faceeef985c1c41115644520b7

Former-commit-id: 25faaa2af0 [formerly dd8ca33fc4] [formerly 25faaa2af0 [formerly dd8ca33fc4] [formerly d143735ea8 [formerly 69f294183da4bbeb535b11c81550b1e9b4124ac6]]]
Former-commit-id: d143735ea8
Former-commit-id: 6f821ed8c9 [formerly 9783dc4d9f]
Former-commit-id: 922da948eb
 2013-02-14 09:49:22 -06:00
Nate Jensen
401c4cc7cb Merge "Issue #1549 Code clean up to properly display gird data ignore the added commented out print statement they will go away." into development 
Former-commit-id: e3b89f87c6 [formerly 5b8504196e] [formerly e3b89f87c6 [formerly 5b8504196e] [formerly 25580a8adc [formerly 4c1268c3d9c8acaad2fe334c97ee2fb8f6d5ccff]]]
Former-commit-id: 25580a8adc
Former-commit-id: 3ff7ce2248 [formerly dcb90069cf]
Former-commit-id: 6b160d14cc
 2013-02-14 09:26:14 -06:00
Roger Ferrel
8e376de359 Issue #1549 Code clean up to properly display gird data ignore the added commented out print statement they will go away. 
Change-Id: I7716af97c3a94f2243be1b219ed9f91c7b67c0d8

Former-commit-id: bfb9f9f156 [formerly 2b509cf7de] [formerly bfb9f9f156 [formerly 2b509cf7de] [formerly e26689a487 [formerly 9ac5a199108a1e1d106a79e67cd6209bd46134cb]]]
Former-commit-id: e26689a487
Former-commit-id: 951e5b237d [formerly e7bae3c272]
Former-commit-id: b47d03b1bc
 2013-02-13 16:45:52 -06:00
Max Schenkelberg
eb451e050f Issue #1610 Fixed null pointer on FileTreeView when file updates arrive and view has not expanded file structure 
Change-Id: Ibfa11dc41ee5fa2a7421469a58932b415261c343

Former-commit-id: 2f8b88df4d [formerly ecb0906597] [formerly 2f8b88df4d [formerly ecb0906597] [formerly 02207b777c [formerly 71b40ef692f0c2109e1026ac5d953d34e808938f]]]
Former-commit-id: 02207b777c
Former-commit-id: 66512cecc6 [formerly bbc904894a]
Former-commit-id: 355e96d4cd
 2013-02-13 15:18:54 -06:00
David Gillingham
189e346a20 Issue #1515: Better handle notifications received after disposing VCParms. 
Change-Id: Ia73102329755303b504871ed55f2a294ef390126

Former-commit-id: 02f2539433 [formerly 5b4de19ebd] [formerly 02f2539433 [formerly 5b4de19ebd] [formerly ddcc84262a [formerly ef9d97a4d0886df2072672b1cebc9b77e689308b]]]
Former-commit-id: ddcc84262a
Former-commit-id: a6883700ee [formerly 874434cea9]
Former-commit-id: dcf5c41129
 2013-02-13 11:08:20 -06:00
Lee Venable
37647f3460 Merge "Issue #1606 Did not set default bullets for CORs." into development 
Former-commit-id: d00a325041 [formerly ffd4bf0028] [formerly d00a325041 [formerly ffd4bf0028] [formerly 3b8bb09da1 [formerly 15403138929b735070553ec08d4e44e4bfc1811e]]]
Former-commit-id: 3b8bb09da1
Former-commit-id: 5db93bcf71 [formerly bfcbfb3f00]
Former-commit-id: a10b4b512a
 2013-02-13 10:31:14 -06:00
Richard Peter
862619a1ba Merge "Issue #1615 Changed ProcessEvent pluginName to dataType. Refactored GribDecoder decode method to a Processor exchange method." into development 
Former-commit-id: edcf52d9c1 [formerly e92c1fe346] [formerly edcf52d9c1 [formerly e92c1fe346] [formerly 671f961a99 [formerly 6574bb0978629fd9fac45b2f7eee1dc7a42d5156]]]
Former-commit-id: 671f961a99
Former-commit-id: ba2c69fb17 [formerly 351d52b311]
Former-commit-id: d4bcf0335e
 2013-02-13 10:24:50 -06:00
Richard Peter
490f6ba46a Merge "Issue #1526 refactor for clarity and to stream responses from pypies" into development 
Former-commit-id: 7438d87e58 [formerly e611aab017] [formerly 7438d87e58 [formerly e611aab017] [formerly dbcb8bd30e [formerly a8d1d7259bf914fac127361bde67d6513f775e8f]]]
Former-commit-id: dbcb8bd30e
Former-commit-id: 0804763d1a [formerly 6ec1990bd9]
Former-commit-id: 8984a46fe5
 2013-02-13 10:18:24 -06:00
Jonathan Sanchez
9fb6402610 Issue #1606 Did not set default bullets for CORs. 
Former-commit-id: 0c3d09f230 [formerly a061ee1363] [formerly 0c3d09f230 [formerly a061ee1363] [formerly 0a8b38d8e9 [formerly 4eb79ee90cf684b8ae38404586a65f09742eb348]]]
Former-commit-id: 0a8b38d8e9
Former-commit-id: b6047c78bb [formerly bdcac83ac7]
Former-commit-id: 005bac7acf
 2013-02-13 10:08:01 -06:00
Lee Venable
aafa43d462 Merge "Issue #1600 Correctly set the StormTrackData motion direction for a CAN and EXP." into development 
Former-commit-id: 39351ec038 [formerly 0d1ebacc71] [formerly 39351ec038 [formerly 0d1ebacc71] [formerly 10008011b4 [formerly c821cfcc556efb4586eb6e9122a90731a7f42083]]]
Former-commit-id: 10008011b4
Former-commit-id: 6ecbdae667 [formerly 44a4701c1e]
Former-commit-id: 870a0b48d7
 2013-02-13 08:58:07 -06:00
Max Schenkelberg
1d93c11fd9 Issue #1500 Fixed concurrent mod exceptions 
Change-Id: I66c2bd159e7631a826a5bb9d0f06d0f3364a2f22

Former-commit-id: 599e3bd319 [formerly 7c3f0cc295] [formerly 599e3bd319 [formerly 7c3f0cc295] [formerly ccf58ba87e [formerly b7f6998ac508c65440c2969b78e45de8f19c0ad9]]]
Former-commit-id: ccf58ba87e
Former-commit-id: 27b8d411b7 [formerly 55f882b00f]
Former-commit-id: 6f49c80c1c
 2013-02-12 17:35:30 -06:00