Mirror of Unidata's AWIPS2.
Find a file
Steve Harris 74c0a4bc61 Merge tag 'OB_14.3.1-28m' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/AdhocSubscription.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/MonitorAreaUtils.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.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalDao.java
	rpms/awips2.core/Installer.gfe.climo/component.spec

Former-commit-id: 40225d128a [formerly 1b83d045ea] [formerly 40225d128a [formerly 1b83d045ea] [formerly 19527f50bb [formerly 353674cd0deec2dd86c38dc75c7593d1477a7e78]]]
Former-commit-id: 19527f50bb
Former-commit-id: 8db5f15d53 [formerly bd4b324ebe]
Former-commit-id: f3e7b20ac7
2014-10-28 13:32:31 -05:00
cave Merge tag 'OB_14.3.1-28m' into omaha_14.4.1 2014-10-28 13:32:31 -05:00
deltaScripts Omaha #3720 Remove dataURI from redbook plugin 2014-10-14 17:13:23 -05:00
edexOsgi Merge tag 'OB_14.3.1-28m' into omaha_14.4.1 2014-10-28 13:32:31 -05:00
javaUtilities Merge "Omaha #3573 fixed clean in collaboration dataserver ant script" into omaha_14.4.1 2014-09-02 10:40:13 -05:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP. 2014-05-09 09:34:49 -05:00
msi Issue #2851 - 64-bit Windows build updates; also supports 32-bit builds 2014-03-31 12:37:37 -05:00
nativeLib Omaha #3676 harden numpy array to java array conversions to work with 2014-10-15 09:02:07 -05:00
ncep Omaha #3454 Upgrading to Hibernate 4.2.15 2014-10-20 12:42:19 -05:00
ost Merge tag 'OB_14.3.1-19m' into omaha_14.4.1 2014-09-23 11:41:10 -05:00
pythonPackages Omaha #3598 Update grid scripts to use DAF. Accept level information in request identifiers. 2014-10-21 07:16:18 -04:00
RadarServer Omaha #3502 removed common.convert from rcm feature 2014-08-11 09:56:53 -05:00
rpms Merge tag 'OB_14.3.1-28m' into omaha_14.4.1 2014-10-28 13:32:31 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Omaha #3365 Realign AWIPS2_baseline tests 2014-09-30 12:53:20 -05:00
.gitignore Fix the git ignore file 2012-09-14 12:04:24 -05:00