Richard Peter ba88ac2d5c 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: c9c02248b3 [formerly f13177a981] [formerly 192e5b9be8] [formerly c9c02248b3 [formerly f13177a981] [formerly 192e5b9be8] [formerly 9e3baaa87a [formerly 192e5b9be8 [formerly ed63eaede59b2b8d388d6fa03394f5e8d91c51dd]]]] Former-commit-id: 9e3baaa87a Former-commit-id: a8780f26b5 [formerly 9c3fe01efa] [formerly 42622571fcb8725b87f8d30720e20cf788897ac5 [formerly ae09db35ad]] Former-commit-id: 21adb9c78d59896133d2b3efcbf7dcafb108064e [formerly 13f64a7da8] Former-commit-id: 22f6319986		2013-06-04 14:06:53 -05:00
..
11.9.0-1/db	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
11.9.0-2/db	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00
11.9.0-3/db	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
11.9.0-4	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
11.9.0-5/db	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
11.9.0-6	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
11.9.0-7	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
12.5.1	12.10.1-4 baseline	2012-09-13 12:08:11 -05:00
12.6.1/edex	12.6.1-9 baseline	2012-07-10 07:53:49 -05:00
12.10.1/edex	12.10.1-3 baseline	2012-09-11 16:00:38 -05:00
12.11.1/edex	12.11.1-1 baseline	2012-09-27 15:57:45 -05:00
12.12.1	13.1.2-2 baseline	2013-01-06 14:32:24 -06:00
13.1.2	13.1.2-2 baseline	2013-01-06 14:32:24 -06:00
13.2.1	13.4.1-1 baseline	2013-04-24 17:15:55 -05:00
13.3.1	13.3.1-19 baseline	2013-04-09 08:37:12 -05:00
13.4.1	Issue #1917: Update stat offline processing and add purge. Add batching of stat deleting and vacuum after every aggregation period.	2013-05-23 11:50:34 -05:00
13.5.1	Issue #1869 speed up upgrade script for dropping dataURI.	2013-05-31 14:43:38 -05:00
future	12.9.1-5 baseline	2012-08-21 15:27:03 -05:00
goesr_deploy	12.10.1-3 baseline	2012-09-11 16:00:38 -05:00
unified_grid	13.1.2-2 baseline	2013-01-06 14:32:24 -06:00
unified_grid_rollback	13.1.2-2 baseline	2013-01-06 14:32:24 -06:00
.project	12.9.1-5 baseline	2012-08-21 15:27:03 -05:00
.pydevproject	12.9.1-5 baseline	2012-08-21 15:27:03 -05:00
deltaScripts.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00