Brian.Dyke f4856aae4d 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: 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 63137ed69c [formerly 278aab6b6f [formerly 64c3766ed570885a796f846b889d40413e8250c6]]]] Former-commit-id: 63137ed69c Former-commit-id: 624606c9dd [formerly fcf13ae9f7] [formerly 07e5d6948695c16b1561033e2f9374a9e992b03e [formerly 8160209e52]] Former-commit-id: ff65ed48a968bb0c306792bbf8ffaff1d87d8edf [formerly 5d31c9ec9a] Former-commit-id: f16c305ae4		2014-04-30 12:57:09 -04:00
..
.settings	13.5.1-1 baseline	2013-06-10 15:17:17 -04:00
META-INF	Issue #2361 remove ISerializableObject from harvester plugin	2013-10-24 20:06:08 -05:00
src/com/raytheon/uf/common/datadelivery/harvester	Issue #3012 Various fixes.	2014-04-21 12:26:47 -05:00
utility/common_static/base/datadelivery	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.5.1-1 baseline	2013-06-10 15:17:17 -04:00
.project	13.5.1-1 baseline	2013-06-10 15:17:17 -04:00
build.properties	13.5.1-1 baseline	2013-06-10 15:17:17 -04:00
com.raytheon.uf.common.datadelivery.harvester.ecl	14.1.1-4 baseline	2013-10-28 10:55:16 -04:00