Dave Hladky c31582ce31 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: 363f9c41f5 [formerly 7d244313a5] [formerly 0ac4de6ad0] [formerly 0ac4de6ad0 [formerly 333bf8b36d]] [formerly 363f9c41f5 [formerly 7d244313a5] [formerly 0ac4de6ad0] [formerly 0ac4de6ad0 [formerly 333bf8b36d]] [formerly ccaaa1cfea [formerly 0ac4de6ad0 [formerly 333bf8b36d] [formerly ccaaa1cfea [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]]]] Former-commit-id: ccaaa1cfea Former-commit-id: aa80f53fa7 [formerly d9243205e4] [formerly 93ca9cfe6a] [formerly acc033bda3860bfc848487a3d00bf48aa0c21c58 [formerly 407941b24c780437890a6937639d0d55a05f02fd] [formerly 93ca9cfe6a [formerly 7611339cd8]]] Former-commit-id: f8f12407616a6eb36b41a76ba4d11d202d2f495a [formerly 1470be2678cc30858e885d64731cb2816e28e3ab] [formerly 7e763a5a22 [formerly cb94f9fc97]] Former-commit-id: 7e763a5a22 Former-commit-id: 766d9f09a7		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 #1538 Moved data delivery specific web services out of registry plugins	2013-11-01 09:20:00 -05:00
res/spring	Issue #2584 Step one of versioning for DD	2014-01-24 14:44:12 -06:00
src/com/raytheon/uf/common/datadelivery/registry	Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1	2014-05-05 12:15:14 -05:00
.classpath	13.2.1-2 baseline	2013-01-23 11:18:44 -05:00
.project	13.2.1-2 baseline	2013-01-23 11:18:44 -05:00
build.properties	Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring.	2013-11-14 15:17:28 -06:00
com.raytheon.uf.common.datadelivery.registry.ecl	13.3.1-1 baseline	2013-02-20 16:19:40 -06:00