Mirror of Unidata's AWIPS2.
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: |
||
---|---|---|
cave | ||
cots | ||
cotsSource/org.apache.qpid | ||
deltaScripts | ||
edexOsgi | ||
javaUtilities | ||
ldm | ||
localApps | ||
localization | ||
MHSEmulator | ||
msi | ||
nativeLib | ||
ncep | ||
ost | ||
pythonPackages | ||
RadarServer | ||
rpms | ||
testProcedures/testDocuments | ||
tests | ||
tools | ||
.gitignore |