awips2/edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database
Ben Steffensmeier 9f2f2591ee Merge branch 'ss_builds'(12.12.1-1) into development
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
	pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc

Former-commit-id: ed4f88aa22 [formerly 69fc030bb4] [formerly ed4f88aa22 [formerly 69fc030bb4] [formerly e8090e654b [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]]
Former-commit-id: e8090e654b
Former-commit-id: 109ec1e778 [formerly 60f78c22e3]
Former-commit-id: 7761060a12
2012-11-13 16:00:19 -06:00
..
cluster 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
dao Issue #1302 Merge branch '5-Data_Delivery' into development 2012-11-01 13:36:06 -05:00
handlers 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
plugin Merge branch 'ss_builds'(12.12.1-1) into development 2012-11-13 16:00:19 -06:00
purge Merge branch 'ss_builds'(12.12.1-1) into development 2012-11-13 16:00:19 -06:00
query Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration. 2012-11-07 10:44:42 -06:00
status Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tasks Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
DataAccessLayerException.java 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
DatabasePluginProperties.java Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
DatabasePluginRegistry.java Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
DatabaseSessionConfiguration.java Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
DatabaseSessionFactoryBean.java Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
IDatabasePluginRegistryChanged.java Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
QlServerRequestHandler.java Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00