Richard Peter
192e5b9be8
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
Richard Peter
948d1aabfe
Issue #2058 : Update obsPurgeRules.xml and sfcobsPurgeRules.xml
...
Change-Id: I80fe6124b7cfb0e5988135fa5bd0edacc2785e6c
Former-commit-id: ea807c13a7cf0ff8a561feb46c99e649eb5254a0
2013-05-31 14:43:43 -05:00
Nate Jensen
f3258e77f7
Issue #1989 remove unused schemas
...
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594
Former-commit-id: b0ad25ccd9e20b6bf994a3a46ce38298c363adff
2013-05-29 16:19:28 -05:00
Nate Jensen
99b4a21414
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
...
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: b7b619e1a3a85ac8c5f22a36317e22e15ad557a2
2013-05-29 14:49:43 -05:00
Nate Jensen
1978133177
Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
...
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61
Former-commit-id: a9330ce9247b05a0044778aeea46e0e986f05f2d
2013-05-23 11:20:40 -05:00
Nate Jensen
d74936ef3e
Issue #1989 use camel's built-in DirectVm component
...
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31
Former-commit-id: 90397159ef98097da0754a846d1f67d4839a300d
2013-05-23 10:06:28 -05:00
Steve Harris
7bf9966dcb
13.3.1-17 baseline
...
Former-commit-id: 0eb0081dbf1af625ca75e98ab775247c924c3527
2013-04-01 12:04:56 -05:00
Greg Armendariz
cd5da3a6c5
Fix merge issue
...
Former-commit-id: c9c8fc9c7ece8ab909b13b63964369b36fb20bc0
2013-03-29 09:52:46 -05:00
Steve Harris
fd71e44f0f
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: d0ce26b91945ae5388028c312cbafd314d57c0e6
2013-03-26 10:12:34 -05:00
Brad Gonzales
cd39fcf122
Issue #1785 Adding performance logging for bufrua, grib, obs, radar,
...
redbook, sfcobs, and satellite.
Amend: Made decoder performance logging consistent. Cleaned up other logging.
Change-Id: I1f404583240a9427cfa3dbb82f9ba3f760b3a8d4
Former-commit-id: 871b2ceb2a6745369c1dc6e88d711e5e3a13cc37
2013-03-21 10:58:26 -05:00
Max Schenkelberg
0f1112fb3e
Issue #1638 Removed dependency of pointdata in edex.common and uf.common.spatial in uf.edex.database.
...
Change-Id: I87419a6d70e1a4c58e985fffa54d1fd19471bc79
Former-commit-id: bd68a2e47f8c54d6e06e19ce3e29259c07926b8a
2013-02-27 12:26:32 -06:00
Steve Harris
e4bd20a515
12.12.1-1 baseline
...
Former-commit-id: 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535
2012-11-07 12:41:20 -06:00
Steve Harris
16bf591a33
12.7.1-8 baseline
...
Former-commit-id: 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1
2012-07-19 16:20:40 -05:00
Steve Harris
b13cbb7e00
12.5.1-15 baseline
...
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
2012-06-08 13:39:48 -05:00
Steve Harris
67a5a68300
12.4.1-4 baseline
...
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
2012-04-18 15:18:16 -05:00
Matt Nash
66be3bec40
Moving 12.1.1 into ss_sync
...
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
2012-01-19 11:53:12 -06:00
root
9f19e3f712
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
2012-01-06 08:55:05 -06:00
