Brian.Dyke 278aab6b6f Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2) ... Conflicts: cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java 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.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java Former-commit-id: 64c3766ed570885a796f846b889d40413e8250c6		2014-04-30 12:57:09 -04: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.2.2-6' into master_14.3.1 (at 14.3.1-2)	2014-04-30 12:57:09 -04: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