Richard Peter 9e3baaa87a 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: ed63eaede59b2b8d388d6fa03394f5e8d91c51dd		2013-06-04 14:06:53 -05:00
..
.settings	13.2.1-2 baseline	2013-01-23 11:18:44 -05:00
META-INF	Issue #1960 Generalize and fix the data delivery DbInit process for Postgres 9	2013-05-01 15:47:20 -05:00
res	Issue #2038 Remove unused schemas from datadelivery spring files	2013-05-30 09:49:09 -05:00
resources	Issue #1905 Implemented registry notifications via email	2013-04-18 10:19:12 -05:00
src/com/raytheon/uf/edex/registry	Issue #2038 Change registry code to use GenericRegistry, use Spring 3 embedded DB feature in tests	2013-06-03 14:54:53 -05:00
utility	Merge branch 'omaha_13.4.1' (13.4.1-13) into development	2013-06-04 14:06:53 -05:00
web	Issue #1989 remove unused schemas	2013-05-29 16:19:28 -05:00
.classpath	Issue #1905 Implemented registry notifications via email	2013-04-18 10:19:12 -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.edex.registry.ebxml.ecl	13.3.1-1 baseline	2013-02-20 16:19:40 -06:00