Mirror of Unidata's AWIPS2.
Find a file
Ben Steffensmeier 109ec1e778 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 e8090e654b [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]
Former-commit-id: e8090e654b
Former-commit-id: 60f78c22e3
2012-11-13 16:00:19 -06:00
cave Merge branch 'ss_builds'(12.12.1-1) into development 2012-11-13 16:00:19 -06:00
cots Issue #1325 Update geotools source path entries per code review. 2012-11-13 12:06:54 -06:00
cotsSource/org.apache.qpid Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
deltaScripts Issue #189 update readme with more install notes, remove common subgrid package that was moved to edex, mark several classes deprecated. 2012-11-02 10:37:42 -05:00
edexOsgi Merge branch 'ss_builds'(12.12.1-1) into development 2012-11-13 16:00:19 -06:00
javaUtilities 12.11.1-4 baseline 2012-10-16 13:27:07 -05:00
ldm 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization 12.6.1-9 baseline 2012-07-10 07:53:49 -05:00
MHSEmulator 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
msi Merge branch 'ss_builds' (12.9.1-5) into development_on_ss_builds 2012-08-21 16:17:58 -05:00
nativeLib Issue #1274 Added Token control for java code and scripts started by RFC Crons. 2012-10-31 21:20:40 -05:00
ncep Issue #189 merge ncep changes to unified grid. 2012-11-08 14:34:55 -06:00
ost 12.12.1-1 baseline 2012-11-07 12:41:20 -06:00
pythonPackages 12.12.1-1 baseline 2012-11-07 12:41:20 -06:00
RadarServer Issue #1302 Merge branch '5-Data_Delivery' into development 2012-11-01 13:36:06 -05:00
rpms 12.12.1-1 baseline 2012-11-07 12:41:20 -06:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tools Merge branch 'master' (OB12.7.1-8) into development 2012-07-27 14:44:44 -05:00
.gitignore Fix the git ignore file 2012-09-14 12:04:24 -05:00