Brian.Dyke 362d882b40 Merge branch 'master_14.2.2' into master_14.3.1 ... Merge (14.2.2-5 into 14.3.1-1) Conflicts: cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java Former-commit-id: 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]] Former-commit-id: fb1f5aa593 Former-commit-id: f0b8ea5822		2014-04-25 11:06:11 -04:00
..
11.9.0-1/db	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
11.9.0-2/db	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00
11.9.0-3/db	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
11.9.0-4	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
11.9.0-5/db	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
11.9.0-6	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
11.9.0-7	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
12.5.1	12.10.1-4 baseline	2012-09-13 12:08:11 -05:00
12.6.1/edex	12.6.1-9 baseline	2012-07-10 07:53:49 -05:00
12.10.1/edex	12.10.1-3 baseline	2012-09-11 16:00:38 -05:00
12.11.1/edex	12.11.1-1 baseline	2012-09-27 15:57:45 -05:00
12.12.1	13.1.2-2 baseline	2013-01-06 14:32:24 -06:00
13.1.2	13.1.2-2 baseline	2013-01-06 14:32:24 -06:00
13.2.1	13.4.1-1 baseline	2013-04-24 17:15:55 -05:00
13.3.1	13.3.1-19 baseline	2013-04-09 08:37:12 -05:00
13.4.1	14.1.1-4 baseline	2013-10-28 10:55:16 -04:00
13.5.1	14.1.1-4 baseline	2013-10-28 10:55:16 -04:00
13.5.2	14.1.1-3 baseline	2013-10-28 10:46:02 -04:00
13.6.1	Merge "Issue #1571 Refactored GFE to store GridParmInfo and ParmStorageInfo in PostGres" into development	2013-08-21 14:18:08 -05:00
14.2.1	Issue #2949 Updated scripts	2014-04-01 12:33:48 -05:00
14.3.1	Issue #2864 - Change how saved subset files are stored.	2014-04-11 08:27:42 -05:00
future	12.9.1-5 baseline	2012-08-21 15:27:03 -05:00
goesr_deploy	12.10.1-3 baseline	2012-09-11 16:00:38 -05:00
unified_grid	13.1.2-2 baseline	2013-01-06 14:32:24 -06:00
unified_grid_rollback	13.1.2-2 baseline	2013-01-06 14:32:24 -06:00
.project	12.9.1-5 baseline	2012-08-21 15:27:03 -05:00
.pydevproject	12.9.1-5 baseline	2012-08-21 15:27:03 -05:00
deltaScripts.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00