Mirror of Unidata's AWIPS2.
Find a file
Richard Peter 13f64a7da8 Merge branch 'omaha_13.4.1' (13.4.1-13) into development
Conflicts:
	cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/AggregateRecordDao.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java
	tests/unit/com/raytheon/uf/edex/stats/AggregateManagerTest.java

Former-commit-id: 192e5b9be8 [formerly 192e5b9be8 [formerly ed63eaede59b2b8d388d6fa03394f5e8d91c51dd]]
Former-commit-id: 9e3baaa87a
Former-commit-id: ae09db35ad
2013-06-04 14:06:53 -05:00
cave Merge branch 'omaha_13.4.1' (13.4.1-13) into development 2013-06-04 14:06:53 -05:00
cots Issue #1989 fix for webpages 2013-05-29 15:21:10 -05:00
cotsSource/org.apache.qpid Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
deltaScripts Merge branch 'omaha_13.4.1' (13.4.1-13) into development 2013-06-04 14:06:53 -05:00
edexOsgi Merge branch 'omaha_13.4.1' (13.4.1-13) into development 2013-06-04 14:06:53 -05:00
javaUtilities Issue #2021 - relocate all Java hydro projects from nativeLib to a sub-directory within javaUtilities 2013-06-03 11:05:21 -05:00
ldm 13.2.1-2 baseline 2013-01-23 11:18:44 -05:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization Issue #1663 - awips2-database will no longer install site-specific databases. 2013-04-04 13:03:08 -05:00
MHSEmulator 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
msi Issue #1987 - updates to support Eclipse 3.8 Windows 32-bit builds 2013-05-16 11:01:40 -05:00
nativeLib Issue #2021 - native hydro code will now compile successfully 2013-06-04 09:22:00 -05:00
ncep Issue #1989 remove unused schemas 2013-05-29 16:19:28 -05:00
ost Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh 2013-05-29 14:49:43 -05:00
pythonPackages Merge branch 'omaha_13.4.1' (13.4.1-13) into development 2013-06-04 14:06:53 -05:00
RadarServer Issue #1927 - add quartz as a RadarServer build dependency 2013-05-15 12:38:02 -05:00
rpms Merge branch 'omaha_13.4.1' (13.4.1-13) into development 2013-06-04 14:06:53 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Merge branch 'omaha_13.4.1' (13.4.1-13) into development 2013-06-04 14:06:53 -05:00
tools 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
.gitignore Fix the git ignore file 2012-09-14 12:04:24 -05:00