Dave Hladky 766d9f09a7 Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1 ... Conflicts: edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java Former-commit-id: 7d244313a5 [formerly 0ac4de6ad0] [formerly 333bf8b36d] [formerly 7d244313a5 [formerly 0ac4de6ad0] [formerly 333bf8b36d] [formerly ccaaa1cfea [formerly 333bf8b36d [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]]] Former-commit-id: ccaaa1cfea Former-commit-id: d9243205e4 [formerly 93ca9cfe6a] [formerly 407941b24c780437890a6937639d0d55a05f02fd [formerly 7611339cd8]] Former-commit-id: 1470be2678cc30858e885d64731cb2816e28e3ab [formerly cb94f9fc97] Former-commit-id: 7e763a5a22		2014-05-05 12:15:14 -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	Issue #2992 Updated DD list of active registries	2014-04-30 17:38:28 -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.3.1' (14.3.1-3) into omaha_14.3.1	2014-05-05 12:15:14 -05: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