xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/cave/com.raytheon.uf.viz.datadelivery
History
Brian.Dyke e56bd61ee6 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: 63137ed69c [formerly 64c3766ed570885a796f846b889d40413e8250c6]
Former-commit-id: 278aab6b6f
2014-04-30 12:57:09 -04:00
..
.settings 13.2.1-2 baseline 2013-01-23 11:18:44 -05:00
icons 13.2.1-2 baseline 2013-01-23 11:18:44 -05:00
localization Issue #2314 - Various fixes to the DD Notification Dialog 2013-09-04 15:20:20 -05:00
META-INF Issue #2491 Bug fixes and clean up all remaining resource datas. 2013-10-29 17:35:55 -05:00
res/spring Issue #2538 - Add AdhocSubscripionHander to SubscriptionHandler. Fix problem querying for adhoc subs. 2014-01-20 17:44:02 -06:00
src/com/raytheon/uf/viz/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.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 13.2.1-2 baseline 2013-01-23 11:18:44 -05:00
com.raytheon.uf.viz.datadelivery.ecl 13.3.1-1 baseline 2013-02-20 16:19:40 -06:00
plugin.xml Issue #2391 - Add Data Delivery to product browser. 2013-09-20 08:38:35 -05:00