Brian.Dyke 14a63a19e1 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: 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]] Former-commit-id: 3524838f9f Former-commit-id: bb5a7e713dac6962660d9c769971464b6792cb76 [formerly 029f5753ad] Former-commit-id: bf3758efa3		2014-04-25 11:06:11 -04:00
..
cache	13.5.1-1 baseline	2013-06-10 15:17:17 -04:00
db/hibernateConfig	Issue #2125: Clean up hibernate warnings	2014-01-17 14:12:34 -06:00
res	13.5.1-1 baseline	2013-06-10 15:17:17 -04:00
spring	Merge branch 'omaha_14.2.2' (14.2.2-3) into development	2014-04-11 16:23:09 -05:00
banner.txt	12.9.1-5 baseline	2012-08-21 15:27:03 -05:00
logback-dataprovideragent.xml	Issue #2142 initial cutover from log4j to SLF4J and logback	2013-07-01 14:41:05 -05:00
logback-ingest.xml	Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)	2014-03-06 08:39:43 -06:00
logback-registry.xml	Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)	2014-03-06 08:39:43 -06:00
logback.xml	Merge branch 'master_14.1.2' into master_14.2.1	2014-04-09 16:00:54 -05:00
logging.properties	Issue #2142 initial cutover from log4j to SLF4J and logback	2013-07-01 14:41:05 -05:00
modes.xml	Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)	2014-03-06 08:39:43 -06:00
wrapper.conf	Issue #2909 Remove useLegacyMergeSort java parameter	2014-03-13 11:54:15 -05:00