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
..
.settings	13.2.1-2 baseline	2013-01-23 11:18:44 -05:00
META-INF	Issue #1802 Refactored DD transaction management	2013-03-25 15:15:38 -05:00
res/spring	Issue #1989 remove unused schemas	2013-05-29 16:19:28 -05:00
src/com/raytheon/uf/edex/datadelivery/event	Issue #1802 Implemented ebxml registry replication	2013-04-12 11:27:45 -05:00
utility/common_static/base/purge	13.2.1-2 baseline	2013-01-23 11:18:44 -05: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.edex.datadelivery.event.ecl	13.3.1-1 baseline	2013-02-20 16:19:40 -06:00
component-deploy.xml	13.2.1-2 baseline	2013-01-23 11:18:44 -05:00