Dave Hladky 7d244313a5 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: ccaaa1cfea [formerly 333bf8b36d [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]] Former-commit-id: 333bf8b36d Former-commit-id: 0ac4de6ad0		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 #2450 - Send notifications to Notification Center when subscriptions expire.	2013-11-06 12:23:09 -06:00
res	Issue #2726: Edex graceful shutdown.	2014-04-14 13:10:11 -05:00
resources	Issue #2469 Fixed default rules implementation	2014-02-24 13:06:52 -06:00
src/com/raytheon/uf/edex/datadelivery/retrieval	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 #1538 Federated registry fixes/modifications	2013-08-28 11:41:06 -05:00
.classpath	13.3.1-12 baseline	2013-03-25 13:27:13 -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.datadelivery.retrieval.ecl	13.3.1-1 baseline	2013-02-20 16:19:40 -06:00