awips2/rpms
Richard Peter a8780f26b5 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 9e3baaa87a [formerly 192e5b9be8 [formerly ed63eaede59b2b8d388d6fa03394f5e8d91c51dd]]]
Former-commit-id: 9e3baaa87a
Former-commit-id: 42622571fcb8725b87f8d30720e20cf788897ac5 [formerly ae09db35ad]
Former-commit-id: 9c3fe01efa
2013-06-04 14:06:53 -05:00
..
awips2.64 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
awips2.ade 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
awips2.cave Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui 2013-05-22 22:34:45 -05:00
awips2.core Merge branch 'omaha_13.4.1' (13.4.1-13) into development 2013-06-04 14:06:53 -05:00
awips2.edex Issue #1989 remove high memory mode, reorganize wrapper.conf 2013-05-29 12:06:15 -05:00
awips2.qpid 13.4.1-11 baseline 2013-05-21 09:19:25 -04:00
build Issue #2047 - initial commit of Java 1.7; rpm build can build both Java 6 and Java 7 2013-05-31 11:47:09 -05:00
common 13.4.1-1 baseline 2013-04-24 17:15:55 -05:00
delta Issue #202 - restoring rpm directory to ss_sync. 2012-01-20 13:38:00 -06:00
legal Merge branch 'omaha_13.4.1' (13.4.1-9) into development 2013-05-17 10:33:18 -05:00
python.site-packages 13.4.1-1 baseline 2013-04-24 17:15:55 -05:00
utility/scripts Issue #202 - restoring rpm directory to ss_sync. 2012-01-20 13:38:00 -06:00
.project Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
rpms.ecl 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
version.txt Issue #202 - restoring rpm directory to ss_sync. 2012-01-20 13:38:00 -06:00