Commit graph

267 commits

Author SHA1 Message Date
Steve Harris
fd2de8135b 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: 9379905195 [formerly 953d1697a9] [formerly 8bf7abcd71] [formerly 04d398beb4 [formerly 8bf7abcd71 [formerly c5f3a5bc748e16681283e12823a254376e307c66]]]
Former-commit-id: 04d398beb4
Former-commit-id: 60b1575b82af8fe5f398bec6e14787f0de50259b [formerly 1801c8a0c9]
Former-commit-id: 29d0a059dd
2013-04-03 17:38:24 -04:00
Steve Harris
b6f53af0bf 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: 7a9ad0392e [formerly ec6f65d581] [formerly 20349e11b0] [formerly 4ff8c8967a [formerly 20349e11b0 [formerly b656a1ed430a571fbda029479ff457bb4405efc0]]]
Former-commit-id: 4ff8c8967a
Former-commit-id: e9b03748c5b3a0ff74a2cebeae786a2a00a71ef0 [formerly 6282e0fd39]
Former-commit-id: 49649155f2
2013-04-03 17:17:32 -04:00
Steve Harris
8a561e4b84 13.2.1-19 baseline
Former-commit-id: 127cd26812 [formerly 88a4bb0924] [formerly bebd9ad1f4] [formerly fc859547f8 [formerly bebd9ad1f4 [formerly 541273ef3aa42ea81b9b51ad1b4e7a9198b816b7]]]
Former-commit-id: fc859547f8
Former-commit-id: 34cab86a38e7b40b1cbd8dddbfeae07e06a3afb3 [formerly a83eddfe7b]
Former-commit-id: 4525c281f3
2013-04-01 10:11:24 -04:00
Steve Harris
1b17e990f1 13.2.1-18 baseline
Former-commit-id: 0bb9bde142 [formerly 97dfda9020] [formerly 3fd5612f89] [formerly f52a716b3f [formerly 3fd5612f89 [formerly aaef550ed7b6715c68b755514ceb504a9a9e9453]]]
Former-commit-id: f52a716b3f
Former-commit-id: a58961e5fad959c07418231b89523dfd54790ef3 [formerly 72edfa459b]
Former-commit-id: 6e292f6296
2013-03-20 16:46:35 -04:00
Steve Harris
848c2097fa 13.2.1-17 baseline
Former-commit-id: 3dff54e277 [formerly 4bb3ad8bde] [formerly 43aa54dc4c] [formerly e3e250c817 [formerly 43aa54dc4c [formerly 1530bd69d5e34c81edae099c0670ae3899c94d1e]]]
Former-commit-id: e3e250c817
Former-commit-id: 924d3b5332b2e82c2296a201f090a2182fccc479 [formerly 6bfab62991]
Former-commit-id: acb3d94a34
2013-03-18 13:01:37 -04:00
Steve Harris
409b19b3a9 13.2.1-16 baseline
Former-commit-id: f677bae97c [formerly 1eca318fab] [formerly a75fe06bfe] [formerly ef031e34df [formerly a75fe06bfe [formerly e40b78e021afdc0d3775c7bd3720aee81b58133a]]]
Former-commit-id: ef031e34df
Former-commit-id: 62b07834d0695cb159804fcc78f0c3c3815da4b6 [formerly 7915f0ce01]
Former-commit-id: 7cdd09f484
2013-03-18 12:57:34 -04:00
Steve Harris
75e51266e4 13.2.1-15 baseline
Former-commit-id: b16f2448a9 [formerly ff687e572b] [formerly 7b52d3eb6e] [formerly 7617a2437f [formerly 7b52d3eb6e [formerly a6d7a7ca85cc185d9cd3394a6e6e82f72b8f70fc]]]
Former-commit-id: 7617a2437f
Former-commit-id: 95795084a4154ad9fabef9bc6d518b7567cc0437 [formerly 29c9d5a170]
Former-commit-id: b237f19e78
2013-03-18 12:53:04 -04:00
Steve Harris
874db8cbea 13.2.1-14 baseline
Former-commit-id: 69d88d9067 [formerly 5584a04cbd] [formerly 00ce32ea21] [formerly af22cfad98 [formerly 00ce32ea21 [formerly 101c9de4e57be6c25dab4f1e6d9158a33ca89005]]]
Former-commit-id: af22cfad98
Former-commit-id: 2747fe42a135bc952d56bd70816b65ce98e19e69 [formerly d8775866a6]
Former-commit-id: 604f8cc059
2013-03-18 12:46:46 -04:00
Steve Harris
3f9462d6b2 13.2.1-13 baseline
Former-commit-id: 301e4186db [formerly 7f54c8ce19] [formerly 088e318fda] [formerly 94fa707724 [formerly 088e318fda [formerly 54d1ecdf86e471b984eb4a74d42d03145ae067d0]]]
Former-commit-id: 94fa707724
Former-commit-id: d5679c31e74b194d44517baaa8a47532867fdaa6 [formerly 0706fce85c]
Former-commit-id: 377d09ffe3
2013-03-11 11:55:20 -04:00
Steve Harris
ebf5b3e1cc 13.2.1-12 baseline
Former-commit-id: 719b5f8ef7 [formerly 1e9f9af89c] [formerly 23a41ad607] [formerly de136aad72 [formerly 23a41ad607 [formerly 6316b9db6cbf29e0038128763d2ad86b1b7abae8]]]
Former-commit-id: de136aad72
Former-commit-id: 31e65336f5df646e56a476308e974fb9924b6e6b [formerly e71ef2b835]
Former-commit-id: 18e488a203
2013-03-07 13:43:04 -05:00
Steve Harris
5a005ceb80 13.2.1-11 baseline
Former-commit-id: 5acc4265ae [formerly 0fa57eeaf2] [formerly 41dc7c0396] [formerly 0684d77845 [formerly 41dc7c0396 [formerly 9e9758e833caa408d168a5de2fe35be8e5451051]]]
Former-commit-id: 0684d77845
Former-commit-id: 350b197211835ca4f69364b7aed4480599794989 [formerly 9cc1613b50]
Former-commit-id: 6710698a10
2013-03-04 17:34:39 -05:00
Steve Harris
a7f2a694c5 13.2.1-10 baseline
Former-commit-id: a08b994afd [formerly 317c81a797] [formerly 48ebd10390] [formerly acf2f8ff92 [formerly 48ebd10390 [formerly 9880bba4c4a0fd8d3352036294745b5b9c0aa7d3]]]
Former-commit-id: acf2f8ff92
Former-commit-id: 44911d1a0c4d6270f04d7df1f037ac320a041e91 [formerly 525d04621d]
Former-commit-id: a25b89bff2
2013-02-25 10:11:00 -05:00
Steve Harris
cef8f92134 13.2.1-9 baseline
Former-commit-id: df8b1abefa [formerly 2dc4a4f50f] [formerly a339cfb704] [formerly d6dc4694f0 [formerly a339cfb704 [formerly 915d8edd4670b38df0474de72cf19c6d8b9aa1a3]]]
Former-commit-id: d6dc4694f0
Former-commit-id: 32556ccd51e1d87415093258d85c1c58158ff497 [formerly 03e04cbcca]
Former-commit-id: 9ec03fb946
2013-02-20 14:11:20 -05:00
Steve Harris
825a99770d 13.2.1-8 baseline
Former-commit-id: 1af911d098 [formerly da707ff25c] [formerly 27d88edcb9] [formerly 535a9402a7 [formerly 27d88edcb9 [formerly 1da0393f24829256c090d06ea8f7a0eca5e68bfd]]]
Former-commit-id: 535a9402a7
Former-commit-id: 0a9388f77add45c1702ce16113b0c20068e2d223 [formerly a68ce64f45]
Former-commit-id: 58bafc0068
2013-02-18 09:23:06 -05:00
Steve Harris
5ac1d7558f 13.1.1-10 baseline
Former-commit-id: 09fe656bcc [formerly eff75cc712] [formerly 56a36af0c2] [formerly 986c332e69 [formerly 56a36af0c2 [formerly d5639bcdf900c60d883eb975e3062ebc55803da1]]]
Former-commit-id: 986c332e69
Former-commit-id: a4928406e5f63cc6b671a4fb535ce16b4d6216ac [formerly fa962f98a4]
Former-commit-id: 57ccd18d85
2013-02-14 14:11:00 -05:00
Steve Harris
01f31354d6 13.1.2-17 baseline
Former-commit-id: e2358ae19b [formerly 4ae6bd9716] [formerly 4855183325] [formerly 01c544953e [formerly 4855183325 [formerly 190f96b29b2c3c9e61150f3789e9fa86e2709e8f]]]
Former-commit-id: 01c544953e
Former-commit-id: 557298a18681895f206a6a9e732ef82d906f1b48 [formerly 8ceb80ebf2]
Former-commit-id: 8c3799c78e
2013-02-14 10:12:02 -05:00
Steve Harris
f76444254f 13.2.1-7 baseline
Former-commit-id: c0b56ae597 [formerly 370b2558f0] [formerly 1ce95d1df2] [formerly c86246ab4d [formerly 1ce95d1df2 [formerly 132297ab4acf8e649e3cf9a3d54d4f4676b280be]]]
Former-commit-id: c86246ab4d
Former-commit-id: 487e22db3552e2e061b19f214b91446a1ad77f8e [formerly 37be2e3f23]
Former-commit-id: 4bc81ce1de
2013-02-11 16:50:39 -05:00
Steve Harris
12e0cd07f2 13.2.1-6 baseline
Former-commit-id: 9b7251d17e [formerly cc48fa4fc6] [formerly b80782b081] [formerly 53adfb7345 [formerly b80782b081 [formerly 2bdf04a09ff6a145eb73f5ad5c1e5140c8a3e0d0]]]
Former-commit-id: 53adfb7345
Former-commit-id: c2b93522588c69765c159821337fa509e477775e [formerly dee1480773]
Former-commit-id: 1f44caaedb
2013-02-07 16:38:44 -05:00
Steve Harris
7ec95d3bac 13.1.2-16 baseline
Former-commit-id: 43aef0d4b2 [formerly f38b23a34b] [formerly 8efdef4375] [formerly fbe89b68ce [formerly 8efdef4375 [formerly ff1a6e936737641f85604ff89cc2903d4370bcb3]]]
Former-commit-id: fbe89b68ce
Former-commit-id: 1b7271a57e2117c2475cd20e0a22508774970d2b [formerly bf64249cee]
Former-commit-id: 2bd67db773
2013-02-06 12:01:12 -05:00
Steve Harris
e88aa292c9 13.1.2-15 baseline
Former-commit-id: a92e6b272e [formerly bfd89f7971] [formerly b188a5a06d] [formerly 986bf8029e [formerly b188a5a06d [formerly b944cdb125c176dfd35646d83d9a8ffacc4f412b]]]
Former-commit-id: 986bf8029e
Former-commit-id: 932be35096ae6883838ce594b6a9da542fa69c5d [formerly 83912cb303]
Former-commit-id: 4d676ee042
2013-02-04 16:45:07 -05:00
Steve Harris
c0a6bcf215 13.2.1-5 baseline
Former-commit-id: 05c2ca86f4 [formerly 1a74d2f0c5] [formerly b4014794de] [formerly f99f99e2f5 [formerly b4014794de [formerly 7a6958217f8b67edac937a23cb1c2ae8a89cedce]]]
Former-commit-id: f99f99e2f5
Former-commit-id: 3422292903b976eeee7ff48443c918b662079695 [formerly 418d8ca0d8]
Former-commit-id: 39cb931bc9
2013-02-04 16:36:29 -05:00
Steve Harris
c03a842f00 13.1.2-14 baseline
Former-commit-id: bfa80715f0 [formerly 45794f7232] [formerly 72330a23eb] [formerly fe21144920 [formerly 72330a23eb [formerly a671299ee53ca3582970c4ff851b9c5120b94401]]]
Former-commit-id: fe21144920
Former-commit-id: 148fd9d1fd414e3a7adad42bc39585ec6cd2d8fa [formerly 694822020a]
Former-commit-id: fb33dcf58e
2013-01-31 13:55:17 -05:00
Steve Harris
398d04ac7f 13.1.2-13 baseline
Former-commit-id: bdd9a0e866 [formerly b2ee20b4ec] [formerly b7357f4828] [formerly 93063d4849 [formerly b7357f4828 [formerly 20b078fc5b7953df9edd6792682d2f63c2de76b2]]]
Former-commit-id: 93063d4849
Former-commit-id: efb26196fc6731ff2d18c8bc9c349dc3c06ddc46 [formerly 95cd4e2a01]
Former-commit-id: 827fb62d9d
2013-01-31 12:10:52 -05:00
Steve Harris
a3bd6e4aec 13.2.1-4 baseline
Former-commit-id: 5acf001c1b [formerly f2b28cfa56] [formerly 1beb655fa0] [formerly 1e77a6f0bd [formerly 1beb655fa0 [formerly 7a04400ebdaabfd380fc9fc0f1dae119f49e59ee]]]
Former-commit-id: 1e77a6f0bd
Former-commit-id: 8415524a4a291e13a736e0a26d38dc66c27a7bbd [formerly e6e4de6247]
Former-commit-id: 06f4b4ad5a
2013-01-31 12:05:59 -05:00
Steve Harris
10229a5df1 13.1.2-12 baseline
Former-commit-id: 5bbe2114d1 [formerly 350ee39799] [formerly 7f6d5c832d] [formerly c8405cf1d9 [formerly 7f6d5c832d [formerly 3ec64317790e32bbd91aef3e92381ec606e727b0]]]
Former-commit-id: c8405cf1d9
Former-commit-id: 1d27520440852099650e4ae1a1b56c915a576785 [formerly 0b1daee7f4]
Former-commit-id: d61eec013f
2013-01-23 17:48:37 -05:00
Steve Harris
a33300aff8 13.1.2-11 baseline
Former-commit-id: a7442a7b92 [formerly 6332f57e00] [formerly 4d1fa0f9a0] [formerly c0975104b0 [formerly 4d1fa0f9a0 [formerly 4b6ccc499be12da3a21715c22067ddab5e9df5bb]]]
Former-commit-id: c0975104b0
Former-commit-id: 5811788eebbc1e6b0c3496d75d0468a97a84ef4a [formerly bf47b79ada]
Former-commit-id: 32eb514f4b
2013-01-23 13:48:55 -05:00
Steve Harris
d069467e81 13.2.1-3 baseline
Former-commit-id: 7d2e979c51 [formerly a5a0da5c02] [formerly 7435527b25] [formerly 2b6ac028bd [formerly 7435527b25 [formerly ba03739c3528638c5383528fd64674ae5af1ed64]]]
Former-commit-id: 2b6ac028bd
Former-commit-id: 32e4736725f3f6d880854f4dba7503e4939e28b7 [formerly cc0fdef15c]
Former-commit-id: 9d248cff7a
2013-01-23 11:24:17 -05:00
Steve Harris
ce726fadc7 13.2.1-2 baseline
Former-commit-id: a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79]
Former-commit-id: d9be4dce21
2013-01-23 11:18:44 -05:00
Steve Harris
1d1791b3b4 13.2.1-1 baseline
Former-commit-id: 11b05eedeb [formerly 48d1aa7732] [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 9771dfae6b [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]
Former-commit-id: c63f9bcae0
Former-commit-id: b971e3aabeeb8f14462f7ad6502dafe876153e63 [formerly f6670806bf]
Former-commit-id: 8ed6a53113
2013-01-23 11:13:03 -05:00
Steve Harris
b4a3933e87 13.1.2-10 baseline
Former-commit-id: 5b617e763b [formerly 683193255d] [formerly 68dde17de2] [formerly 86ea0b666e [formerly 68dde17de2 [formerly 5a6d030d358519ca30fc37bf4a090a00557422a3]]]
Former-commit-id: 86ea0b666e
Former-commit-id: 9f07f7e014b3a205684780ddaf335bdd9b824c4d [formerly d148beb4ca]
Former-commit-id: 39f9dc931a
2013-01-18 10:37:25 -05:00
Steve Harris
71267d323e 13.1.2-9 baseline
Former-commit-id: a78d3ab456 [formerly 6fd587d08d] [formerly 0878a7ea57] [formerly ddc6aec013 [formerly 0878a7ea57 [formerly da5b6c5b6999445b5ded541aac1bbdb46f0d322d]]]
Former-commit-id: ddc6aec013
Former-commit-id: a5350d4f640abae2d8766048e2614c8856764e55 [formerly 5e0a9a8fd2]
Former-commit-id: 5b752c12c4
2013-01-18 10:29:52 -05:00
Steve Harris
13be9f8987 13.1.2-8 baseline
Former-commit-id: 5aaacf4eec [formerly b864fdc303] [formerly e6217a17de] [formerly 06b8eb8db0 [formerly e6217a17de [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: d0dddac1b9c0f73936bff6a2a8424513b3f8a42d [formerly 3caf592e83]
Former-commit-id: 7d0109a349
2013-01-11 16:19:07 -05:00
Steve Harris
4c8e604619 13.1.2-7 baseline
Former-commit-id: 0b15dff12b [formerly a8d90da9c0] [formerly 4f86b07eb0] [formerly 42189b5f88 [formerly 4f86b07eb0 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]]
Former-commit-id: 42189b5f88
Former-commit-id: 14e868b80bdcdb7270336e9346e3a2f321283073 [formerly b7f1dbe72b]
Former-commit-id: f1256f2a9e
2013-01-11 16:12:09 -05:00
Steve Harris
fe763963e9 13.1.2-6 baseline
Former-commit-id: 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57]
Former-commit-id: 82a1ed77a4
2013-01-06 14:55:11 -06:00
Steve Harris
82cdde8491 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]
Former-commit-id: cd4185ef5c
2013-01-06 14:32:24 -06:00
Steve Harris
79b0e973ef 12.12.1-12 baseline
Former-commit-id: 8b74846a1b [formerly 89def5cf03] [formerly e8e41630e8] [formerly 6d610f8e8a [formerly e8e41630e8 [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 033c9cde2068548258f7d65e7f805b1255162c44 [formerly 7bb37caa23]
Former-commit-id: 69ab975fab
2012-12-06 09:18:28 -06:00
Steve Harris
d2da55254b 12.12.1-10 baseline
Former-commit-id: 268262da26 [formerly c7ec50d4f9] [formerly 45f5150eb6] [formerly 28018b8d9b [formerly 45f5150eb6 [formerly 07d77ee5ca986f9762ec9c3276e8320e3f363ebc]]]
Former-commit-id: 28018b8d9b
Former-commit-id: e0830ae197e0ce5e3085d3fffa18fe7132792d42 [formerly 0c67cb78a3]
Former-commit-id: 8a41d325d2
2012-12-06 09:12:15 -06:00
Steve Harris
a45a7fe1bf 12.12.1-8 baseline
Former-commit-id: 8790caf84e [formerly 2d338b4cec] [formerly 19962f41ba] [formerly 5093a7c442 [formerly 19962f41ba [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]]
Former-commit-id: 5093a7c442
Former-commit-id: 8bc76fd17f954171eeb656097e29d253329915de [formerly ee06a94735]
Former-commit-id: ff4131c2ee
2012-12-06 09:02:51 -06:00
Steve Harris
4300583fc2 12.12.1-4 baseline
Former-commit-id: b968ab5135 [formerly b91b7f0fae] [formerly 85130eb611] [formerly 57578da521 [formerly 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]]
Former-commit-id: 57578da521
Former-commit-id: 91397e4ab74890ddf2ddf5f2f930941cbb021f93 [formerly 628ca9e5c6]
Former-commit-id: e35a321a8c
2012-11-14 14:19:20 -06:00
Steve Harris
5f628acefd 12.12.1-3 baseline
Former-commit-id: 48fa2a9106 [formerly a81c46987b] [formerly c999505fba] [formerly b3b5e6d28f [formerly c999505fba [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]]
Former-commit-id: b3b5e6d28f
Former-commit-id: b188535ef6619becad681ca44d5bacd7a27bb351 [formerly 2797cbcdd0]
Former-commit-id: 2e3662028f
2012-11-13 17:27:04 -06:00
Steve Harris
5365b72401 12.12.1-2 baseline
Former-commit-id: 7192b19284 [formerly ed809a02db] [formerly a8560580f8] [formerly 6868eb9b23 [formerly a8560580f8 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 454cf3b19a973251055686ba6bcf2017dd870e1d [formerly df89fe9bed]
Former-commit-id: 111e7607cf
2012-11-13 17:14:24 -06:00
Steve Harris
3cb24c1d06 12.12.1-1 baseline
Former-commit-id: 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63]
Former-commit-id: 4f243de928
2012-11-07 12:41:20 -06:00
Steve Harris
89940e8fed 12.11.1-12 baseline
Former-commit-id: 7f6baf2e24 [formerly 565756567f] [formerly 8682e4f6ca] [formerly 9ff9cb8aa3 [formerly 8682e4f6ca [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]]
Former-commit-id: 9ff9cb8aa3
Former-commit-id: 1acfe145013f9afdd8c598af509871593462a766 [formerly 314c03e7b6]
Former-commit-id: d8b6157aab
2012-10-29 12:15:56 -05:00
Steve Harris
e7a5f938d5 12.11.1-10 baseline
Former-commit-id: 7779b584c0 [formerly 63dddc5f5f] [formerly e845c605e6] [formerly 0ba69044a2 [formerly e845c605e6 [formerly 9dd41e6322bad3e7dced1a32867d9a7f886d70cf]]]
Former-commit-id: 0ba69044a2
Former-commit-id: 6fcb4f94c3d3270f1daa5300ab582f30625bdf7c [formerly cc21977c35]
Former-commit-id: 61224dec54
2012-10-24 15:13:57 -05:00
Steve Harris
320a29466d 12.11.1-7 baseline
Former-commit-id: 59e5b55b96 [formerly 40a5bc1683] [formerly d8ca6b9005] [formerly 79a5638de9 [formerly d8ca6b9005 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]]]
Former-commit-id: 79a5638de9
Former-commit-id: 901f56658eaeddda857d877834f967b14c2f861c [formerly cfd228f0d7]
Former-commit-id: efba080b9c
2012-10-23 16:40:50 -05:00
Steve Harris
ae73939b02 12.11.1-6 baseline
Former-commit-id: 58cd1e90f8 [formerly 30c786a885] [formerly fba4a443a0] [formerly 5c1f3cdc46 [formerly fba4a443a0 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 4bf85ed3f3986d98a009ad57add9c40fe46fa2f2 [formerly 08fc9f6b14]
Former-commit-id: 8beb6fc0b8
2012-10-18 15:53:01 -05:00
Steve Harris
dfdf01de85 12.11.1-5 baseline
Former-commit-id: bb8fe6e556 [formerly 362d6ffaca] [formerly 03f3f3c36a] [formerly a0eaf651ff [formerly 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]]
Former-commit-id: a0eaf651ff
Former-commit-id: 3d301c8774eee84c53a845367dfdb251b5c0f118 [formerly e31c1e5bba]
Former-commit-id: 85ad066b70
2012-10-18 15:46:42 -05:00
Steve Harris
c9b563338a 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]
Former-commit-id: 2c82d9cb07
2012-10-16 13:27:07 -05:00
Steve Harris
7fcbb49a3e 12.11.1-3 baseline
Former-commit-id: a65c057df5 [formerly 196afa0e5f] [formerly 2d0c424713] [formerly 5d796f775c [formerly 2d0c424713 [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]]
Former-commit-id: 5d796f775c
Former-commit-id: 0e268084394b033a5de6dba694d14423a1da3040 [formerly 5723fb0031]
Former-commit-id: 725b2f8ba5
2012-10-15 16:30:31 -05:00
Steve Harris
6e0b2c55d7 12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

Former-commit-id: 04da0dbf50 [formerly 75901860c2] [formerly c12ee14e66] [formerly 1e02387ff1 [formerly c12ee14e66 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]]
Former-commit-id: 1e02387ff1
Former-commit-id: 4b6477f6b0ceaafd125d3a6350ab34e5d7c81ad7 [formerly 42bf60b2fc]
Former-commit-id: 772c60efa4
2012-10-08 13:26:20 -05:00