Richard Peter 44b1782461 Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1 ... Conflicts: cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900 Former-commit-id: 311c52426b3715d3a73c1fa79a8fd427a4b1b09d		2014-04-28 16:27:40 -05:00
..
.settings	13.2.1-2 baseline	2013-01-23 11:18:44 -05:00
META-INF	Issue #2613 Fixed build	2013-12-12 09:44:05 -06:00
res	Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1	2014-04-28 16:27:40 -05:00
resources	Issue #2769: Registry database deadlocking fixes/performance improvements	2014-03-03 10:57:16 -06:00
src/com/raytheon/uf/edex/registry	Merge branch 'master_14.2.2' into master_14.3.1	2014-04-25 11:06:11 -04:00
utility	Issue #2534 Added reciprocated registry replication subscriptions	2013-11-27 12:07:59 -06:00
web	Issue #2928: Update DD WebContainer to allow loading properties from environment	2014-04-23 16:01:40 -05:00
.classpath	Issue #2928: Add default byte limit, set registry byte limit	2014-04-22 15:08:18 -05:00
.project	13.2.1-2 baseline	2013-01-23 11:18:44 -05: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.uf.edex.registry.ebxml.ecl	13.3.1-1 baseline	2013-02-20 16:19:40 -06:00
web.deploy	Issue #2500 - the list of web applications to deploy is no longer hard-coded in deploy-install.	2013-10-28 14:50:28 -05:00