xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/edexOsgi/com.raytheon.edex.utilitysrv
History
Brian.Dyke 3524838f9f 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: f54d2c639a915db14f01f56a7fcc5841b60e1509
2014-04-25 11:06:11 -04:00
..
.settings Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
META-INF Issue #2142 initial cutover from log4j to SLF4J and logback 2013-07-01 14:41:05 -05:00
res/spring Merged 1354 -5 and -6 into 1412 based on 1411-25 2014-04-04 12:57:32 -04:00
src/com/raytheon/edex/services 14.1.1-7 baseline 2013-11-06 14:16:14 -05:00
unit-test/com/raytheon/edex/services Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
utility/edex_static/base Issue #2032 moving localization edex_static files to respective plugins, except colormaps 2013-07-18 17:20:27 -05:00
.classpath Issue #1302 Address peer review comments for 5-Data_Delivery/development merge 2012-11-08 09:57:16 -06:00
.project Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
build.properties Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins. 2014-01-06 17:03:45 -06:00
com.raytheon.edex.utilitysrv.ecl 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00