Steve Harris
|
e197f23ce3
|
13.5.1-4 baseline
Former-commit-id: d18b403b332dff67d1c85d4317bbceda337d1b41
|
2013-06-28 09:46:25 -04:00 |
|
Steve Harris
|
72d22a30c9
|
13.5.1-3 baseline
Former-commit-id: cc90f0c02410fef504ec9de389c07dfa41164247
|
2013-06-24 09:29:43 -04:00 |
|
Steve Harris
|
3386330894
|
13.5.1-2 baseline
Former-commit-id: 36f4554f8f80812a5ffa0d243fe1a4ad6e330192
|
2013-06-17 15:01:22 -04:00 |
|
Steve Harris
|
fe872355a7
|
13.5.1-1 baseline
Former-commit-id: 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3
|
2013-06-10 15:17:17 -04:00 |
|
Steve Harris
|
2fc7f80939
|
Merge branch 'master_13.4.1' into master_13.5.1
Conflicts (solved by taking all of 13.4.1-14):
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.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/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
rpms/awips2.core/Installer.ldm/component.spec
rpms/build/i386/build.sh
Former-commit-id: 388fb201c6914d9ec7986a1017df57e5e2de0633
|
2013-06-10 15:07:59 -04:00 |
|
Steve Harris
|
18b90226a2
|
13.4.1-14 baseline
Former-commit-id: 0e4ca3ea4159ea0256e22f9814f0de85180a41fb
|
2013-06-06 15:15:27 -04:00 |
|
Steve Harris
|
de476791fb
|
13.4.1-13 baseline
Former-commit-id: f79327d3865cb0fa7812d5fba896c1a46013badf
|
2013-05-29 16:30:09 -04:00 |
|
Steve Harris
|
e53ada66b8
|
13.4.1-12 baseline
Former-commit-id: 398b25dee65cd6154c467b657ced5c9d2bada11a
|
2013-05-22 16:42:39 -04:00 |
|
Steve Harris
|
c0376ce9ed
|
13.4.1-11 baseline
Former-commit-id: e414ae01ab52b3940647e46e22bba3b89790c142
|
2013-05-21 09:19:25 -04:00 |
|
Steve Harris
|
92152778b9
|
13.4.1-10 baseline
Former-commit-id: bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4
|
2013-05-20 10:52:47 -04:00 |
|
Steve Harris
|
aff41713f9
|
13.4.1-9 baseline
Former-commit-id: 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375
|
2013-05-16 11:12:07 -04:00 |
|
Steve Harris
|
c59b52a266
|
13.4.1-8 baseline
Former-commit-id: d130c847d4f9d0b491f9326c8b5140fb59174927
|
2013-05-14 09:21:41 -04:00 |
|
Steve Harris
|
8347bed50e
|
13.4.1-7 baseline
Former-commit-id: dd6304e82206bb46b0c0442d15ab5d9312d9f19f
|
2013-05-13 12:58:10 -04:00 |
|
Steve Harris
|
16fe8cc5a2
|
13.4.1-6 baseline
Former-commit-id: f30c650b1c406889c38a5f82bbeda3605adbd9a5
|
2013-05-07 08:47:39 -04:00 |
|
Steve Harris
|
4ae0e2e858
|
13.4.1-5 baseline
Former-commit-id: 2d978fe3d2cf99e04040d191e040dbcb84a60b9a
|
2013-05-03 09:29:14 -05:00 |
|
Steve Harris
|
0f76c3cbee
|
13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4)
Former-commit-id: dca18e1b350f5424ec129b6cd0d602ceb86e119b
|
2013-05-03 09:20:30 -05:00 |
|
Steve Harris
|
7a78f8ac6e
|
13.4.1-4 baseline
Former-commit-id: 4477bad886dc7ae0418409e3bc5ebce7965b6146
|
2013-05-02 10:00:38 -05:00 |
|
Steve Harris
|
86e96f378c
|
13.4.1-3 baseline
Former-commit-id: 02412063da81fbfd3f1bbdd48700e1b1ccdeb4fd
|
2013-04-29 12:25:07 -05:00 |
|
Steve Harris
|
5ebd58a0b3
|
13.4.1-2 baseline
Former-commit-id: 8b85b1f1e96220b29e8c3b891f6df6a9633c3b4d
|
2013-04-24 17:22:10 -05:00 |
|
Steve Harris
|
00332e6305
|
13.4.1-1 baseline
Former-commit-id: c03222bb480d87c05982b4d49f863e615b5b5584
|
2013-04-24 17:15:55 -05:00 |
|
Steve Harris
|
e6d37f3e6d
|
Merge branch 'master_13.3.1' into master_13.4.1
Former-commit-id: 59bd064351a843fd514514de9dc942d13c6d7793
|
2013-04-15 09:34:45 -05:00 |
|
Steve Harris
|
446bec6f49
|
13.3.1-20 baseline
Former-commit-id: 91210030e50e7a19c3d8d4c9d377494de2bc83dd
|
2013-04-15 08:58:59 -05:00 |
|
Steve Harris
|
abaf9f12f9
|
13.3.1-19 baseline
Former-commit-id: ce855032b2b7235b2aea8dc66aff89ca7c54854a
|
2013-04-09 08:37:12 -05:00 |
|
Steve Harris
|
d98a119f4d
|
Merge branch 'master_13.3.1' (13.3.1-18) into master_13.4.1
Initiating master_13.4.1 with 13.3.1-18
conflicts resolved by taking all of 13.3.1-18
Conflicts:
cave/com.raytheon.uf.viz.common.core.feature/feature.xml
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ReferenceSetManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.product.awips/awips.product
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.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/gui/WarngenUIManager.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/hpcGuideNDFD.xml
edexOsgi/com.raytheon.edex.rpgenvdata/src/com/raytheon/edex/rpgenvdata/RPGEnvironmentalDataManager.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/FFMPProcessor.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTI.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
pythonPackages/pypies/pypies/impl/H5pyDataStore.py
Former-commit-id: 735ce03302b54116c8545daf043585fb16fabd11
|
2013-04-04 11:12:22 -05:00 |
|
Steve Harris
|
19bb737425
|
Merge AWIPS2 master branch (13.2.1-21) into master
Former-commit-id: a5433b05559621bce842ce98f68f9fd151109531
|
2013-04-04 09:54:02 -05:00 |
|
Steve Harris
|
9df0038ea3
|
Merge branch 'master_13.2.1' into master
Former-commit-id: 9d79a4e435d69849510f51b6ed8ac13f8eda438a
|
2013-04-04 10:51:40 -04:00 |
|
Steve Harris
|
dab32b0413
|
Merge AWIPS2 master branch (13.2.1-19) into master
All conflicts overridden by 'theirs' merge - all of AWIPS2 master
Conflicts:
cave/com.raytheon.uf.viz.collaboration.pointdata/com.raytheon.uf.viz.collaboration.pointdata.ecl
cave/com.raytheon.uf.viz.collaboration.product.feature/com.raytheon.uf.viz.collaboration.product.feature.ecl
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowISCGridsAction.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.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/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
edexOsgi/com.raytheon.uf.common.datadelivery.registry/build.properties
edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/build.properties
edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: 9cab4557a50e2bcda09365a86b54e5e5613f0a57
|
2013-04-04 08:22:05 -05:00 |
|
Steve Harris
|
33bd359cfe
|
13.2.1-21 baseline
Former-commit-id: f80eddbb15e5ca1710c15d245957345d6f840546
|
2013-04-03 18:08:41 -04:00 |
|
Steve Harris
|
539faf0a71
|
13.2.1-20 baseline
Former-commit-id: 901c37ddfaeb0103160d0bbb2f1c2f623a16f73e
|
2013-04-03 18:05:39 -04:00 |
|
Steve Harris
|
04d398beb4
|
Merge branch 'master_13.2.1' into master
'theirs merge' - took all all master_13.2.1
Conflicts:
cave/com.raytheon.uf.viz.common.core.feature/feature.xml
cave/com.raytheon.uf.viz.core/META-INF/spring/viz.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/auth/UserController.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/CAVELocalizationAdapter.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.uf.viz.cots.feature/feature.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/AbstractAliasLevelNode.java
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/OrLevelNode.java
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/TimeRangeLevelNode.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogMonitorAction.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeSeasAction.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSZoneTableDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAction.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowZoneTableDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
cave/com.raytheon.uf.viz.plugin.nwsauth/src/com/raytheon/uf/viz/plugin/nwsauth/NwsUserManager.java
cave/com.raytheon.uf.viz.sounding/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/Activator.java
cave/com.raytheon.uf.viz.stats/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/GroupingComp.java
cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/IStatsDisplay.java
cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/SelectionManagerDlg.java
cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsControlDlg.java
cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsDisplayCanvas.java
cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsGraphDlg.java
cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourSupport.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/GridInfoDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMonitorDlg.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/ImportLevelNode.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/CoverageUtils.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/HydroDisplayManager.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/util/PointMetadataContainer.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/AwipsCalendar.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualList.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualListConfig.java
cots/org.geotools/.classpath
cots/org.geotools/META-INF/MANIFEST.MF
cots/org.geotools/build.properties
cots/org.junit/.classpath
cots/org.junit/META-INF/MANIFEST.MF
cots/org.junit/build.properties
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/bin/setup.env
edexOsgi/build.edex/esb/bin/wrapper.conf
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/build.edex/esb/conf/spring/cron.properties
edexOsgi/build.edex/esb/conf/spring/edex.xml
edexOsgi/build.edex/esb/etc/registry.sh
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
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/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/notify/GribNotifyMessage.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/notify/GribNotifyQueue.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/topo/StaticDataGenerator.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/topo/StaticTopoData.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/topo/TopoAttributes.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribParamInfoLookup.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_ECMWF-98.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_FSL-59.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_NWSTG-8.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_RFC-9.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_RSMC-54.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_UKMET-74.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/parameter/alias/grib.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/GribModels_FNMO-58.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RSMC-54.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml
edexOsgi/com.raytheon.edex.plugin.satellite/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/AbstractPrivilegedLocalizationRequestHandler.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/DataFactoryRegistry.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/grid/IGridData.java
edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/StatusConstants.java
edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/subgrid/SubGridDef.java
edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/mapping/DatasetIdMapper.java
edexOsgi/com.raytheon.uf.common.dataplugin.level/src/com/raytheon/uf/common/dataplugin/level/mapping/LevelMapper.java
edexOsgi/com.raytheon.uf.common.dataplugin.level/utility/common_static/base/level/alias/gempak.xml
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/subgrid/SubGrid.java
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/FileLocker.java
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/LocalizationFile.java
edexOsgi/com.raytheon.uf.common.parameter/src/com/raytheon/uf/common/parameter/lookup/ParameterLookup.java
edexOsgi/com.raytheon.uf.common.parameter/src/com/raytheon/uf/common/parameter/mapping/ParameterMapper.java
edexOsgi/com.raytheon.uf.common.parameter/utility/common_static/base/parameter/definition/parameters.xml
edexOsgi/com.raytheon.uf.common.plugin.nwsauth/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/NwsRoleData.java
edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/RoleXML.java
edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/UserXML.java
edexOsgi/com.raytheon.uf.common.serialization.comm/src/com/raytheon/uf/common/serialization/comm/RequestRouter.java
edexOsgi/com.raytheon.uf.common.sounding/utility/edex_static/base/python/RaobPyUtil.py
edexOsgi/com.raytheon.uf.common.stats/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/AggregateRecord.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/GraphDataRequest.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/DataPoint.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/GraphData.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/StatsBin.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/StatsData.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/StatsEventData.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/util/UnitUtils.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/AbstractTimer.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/ITimer.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimerImpl.java
edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/ConvertUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/mapping/AliasNamespace.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/mapping/Mapper.java
edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteServerRequestRouter.java
edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
edexOsgi/com.raytheon.uf.edex.event/src/com/raytheon/uf/edex/event/EventBus.java
edexOsgi/com.raytheon.uf.edex.gridcoverage/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.gridcoverage/res/spring/gridcoverage-common.xml
edexOsgi/com.raytheon.uf.edex.gridcoverage/src/com/raytheon/uf/edex/gridcoverage/GetGridCoverageHandler.java
edexOsgi/com.raytheon.uf.edex.ohd/resources/com.raytheon.uf.edex.ohd.properties
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridInfoCache.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/res/spring/nwsauth-request.xml
edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/utility/common_static/base/roles/userRoles.xml
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/data/StatsDataAccumulator.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/handler/GraphDataHandler.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/util/Archiver.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/util/ConfigLoader.java
edexOsgi/com.raytheon.uf.edex.stats/utility/edex_static/base/stats/edexProcessStats.xml
nativeLib/dist.native/i386-pc-linux-gnu.tar
ncep/gov.noaa.nws.ncep.viz.gempak.nativelib.linux32/libgpk_logs.so
ncep/gov.noaa.nws.ncep.viz.gempak.nativelib.linux32/libgpk_nologs.so
pythonPackages/pypies/pypies/impl/H5pyDataStore.py
Former-commit-id: c5f3a5bc748e16681283e12823a254376e307c66
|
2013-04-03 17:38:24 -04:00 |
|
Steve Harris
|
4ff8c8967a
|
Merge branch 'master_13.1.2' into master
'theirs merge' - took all of master_13.1.2
Conflicts:
cave/com.raytheon.uf.viz.collaboration.pointdata/com.raytheon.uf.viz.collaboration.pointdata.ecl
cave/com.raytheon.uf.viz.collaboration.product.feature/com.raytheon.uf.viz.collaboration.product.feature.ecl
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
edexOsgi/com.raytheon.uf.common.parameter/build.properties
edexOsgi/com.raytheon.uf.common.spatial/build.properties
edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml
Former-commit-id: b656a1ed430a571fbda029479ff457bb4405efc0
|
2013-04-03 17:17:32 -04:00 |
|
Steve Harris
|
ce6a06a7e3
|
13.3.1-18 baseline
Former-commit-id: 245ab5d951a10e74aba53b036001316e1c7653fe
|
2013-04-03 14:58:29 -05:00 |
|
Steve Harris
|
a3fe998f8f
|
13.3.1-17 baseline
Former-commit-id: 0eb0081dbf1af625ca75e98ab775247c924c3527
|
2013-04-01 12:04:56 -05:00 |
|
Steve Harris
|
3066dd33e5
|
13.3.1-16 baseline
Former-commit-id: 18321f88c2efedf141b84e7de18c200e1037f740
|
2013-04-01 11:39:08 -05:00 |
|
Steve Harris
|
3d8ed484be
|
13.3.1-15 baseline
Former-commit-id: 369cf4feaee63c96725cb6efc5774b8f6b8cbf08
|
2013-04-01 11:33:20 -05:00 |
|
Steve Harris
|
fc859547f8
|
13.2.1-19 baseline
Former-commit-id: 541273ef3aa42ea81b9b51ad1b4e7a9198b816b7
|
2013-04-01 10:11:24 -04:00 |
|
Steve Harris
|
4d4234d5c9
|
13.3.1-14 baseline
Former-commit-id: e05ab5dbc442d410ae53400f087c02197ba5068b
|
2013-03-27 22:10:03 -05:00 |
|
Steve Harris
|
9fba973fd0
|
13.3.1-14 baseline
Former-commit-id: 0b52508caf520abeba4a75d38c9ed9130cc12c9e
|
2013-03-27 17:59:34 -05:00 |
|
Steve Harris
|
c65f3e68e5
|
13.3.1-13 baseline
Former-commit-id: 9c263e3ffc35677d7015158e06b64f376e7f801d
|
2013-03-26 12:43:07 -05:00 |
|
Steve Harris
|
aaac0b51e5
|
13.3.1-12 baseline
Former-commit-id: 1f109861760e5fbc9d7a13cc4f518341cbc31276
|
2013-03-25 13:27:13 -05:00 |
|
Steve Harris
|
373d13df39
|
13.3.1-11 baseline
Former-commit-id: 81effd422de0285d345ebfd5c472c924ce261815
|
2013-03-25 13:20:03 -05:00 |
|
Steve Harris
|
7078eec1b1
|
13.3.1-10 baseline
Former-commit-id: b48761e6f964bc7448439c1b69f85d75593ef90d
|
2013-03-20 15:53:01 -05:00 |
|
Steve Harris
|
f52a716b3f
|
13.2.1-18 baseline
Former-commit-id: aaef550ed7b6715c68b755514ceb504a9a9e9453
|
2013-03-20 16:46:35 -04:00 |
|
Steve Harris
|
f2b3fddfe2
|
13.3.1-9 baseline
Former-commit-id: 17276903ed005e17165649f236e6a99afa47b7fb
|
2013-03-19 14:22:56 -05:00 |
|
Steve Harris
|
c15b3ffe20
|
13.3.1-8 baseline
Former-commit-id: 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6
|
2013-03-18 15:43:32 -05:00 |
|
Steve Harris
|
e3e250c817
|
13.2.1-17 baseline
Former-commit-id: 1530bd69d5e34c81edae099c0670ae3899c94d1e
|
2013-03-18 13:01:37 -04:00 |
|
Steve Harris
|
ef031e34df
|
13.2.1-16 baseline
Former-commit-id: e40b78e021afdc0d3775c7bd3720aee81b58133a
|
2013-03-18 12:57:34 -04:00 |
|
Steve Harris
|
7617a2437f
|
13.2.1-15 baseline
Former-commit-id: a6d7a7ca85cc185d9cd3394a6e6e82f72b8f70fc
|
2013-03-18 12:53:04 -04:00 |
|
Steve Harris
|
af22cfad98
|
13.2.1-14 baseline
Former-commit-id: 101c9de4e57be6c25dab4f1e6d9158a33ca89005
|
2013-03-18 12:46:46 -04:00 |
|
Steve Harris
|
e12ed113ae
|
13.3.1-7 baseline
Former-commit-id: aa42eb84d41a7f0577ab8ce8555c0922833f96f1
|
2013-03-13 09:50:28 -05:00 |
|