Greg Armendariz
|
7382b92b41
|
Fix merge issue
Former-commit-id: 466fa3fd41 [formerly 611661ccc9] [formerly cd5da3a6c5] [formerly 5da06cadd7 [formerly cd5da3a6c5 [formerly c9c8fc9c7ece8ab909b13b63964369b36fb20bc0]]]
Former-commit-id: 5da06cadd7
Former-commit-id: 44cbb71a5bf0c2824428a793efce64319681b9f5 [formerly f0e1b80cd2]
Former-commit-id: dcd36e64a6
|
2013-03-29 09:52:46 -05:00 |
|
Steve Harris
|
5be2208aaf
|
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: e154e58354 [formerly b0621d90bc] [formerly fd71e44f0f] [formerly a23cecdb26 [formerly fd71e44f0f [formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]]
Former-commit-id: a23cecdb26
Former-commit-id: 26c72d3b440387cfdf094f0ac6a91b946edf8f59 [formerly e96e95b565]
Former-commit-id: 02105701a0
|
2013-03-26 10:12:34 -05:00 |
|
Brad Gonzales
|
954314d74d
|
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: 237dc5ea14 [formerly f7debfc55f] [formerly cd39fcf122] [formerly 8c309840a3 [formerly cd39fcf122 [formerly 871b2ceb2a6745369c1dc6e88d711e5e3a13cc37]]]
Former-commit-id: 8c309840a3
Former-commit-id: dc7990ac7d34c4a007a93ed196275f6c5dbbe1f1 [formerly 9f9248bcd9]
Former-commit-id: 2de2221a35
|
2013-03-21 10:58:26 -05:00 |
|
Max Schenkelberg
|
bde1619d1c
|
Issue #1638 Removed dependency of pointdata in edex.common and uf.common.spatial in uf.edex.database.
Change-Id: I87419a6d70e1a4c58e985fffa54d1fd19471bc79
Former-commit-id: 2fd6f3ed4e [formerly c8a5f1a007] [formerly 0f1112fb3e] [formerly 38bba3705f [formerly 0f1112fb3e [formerly bd68a2e47f8c54d6e06e19ce3e29259c07926b8a]]]
Former-commit-id: 38bba3705f
Former-commit-id: 71ee9b4fe7ff08b057d3d7bee4f424a8213cdcca [formerly 6ebc058df4]
Former-commit-id: 41706c42f2
|
2013-02-27 12:26:32 -06:00 |
|
Steve Harris
|
3cb24c1d06
|
12.12.1-1 baseline
Former-commit-id: 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63]
Former-commit-id: 4f243de928
|
2012-11-07 12:41:20 -06:00 |
|
Steve Harris
|
e1eb7f5972
|
12.7.1-8 baseline
Former-commit-id: b242dd98d6 [formerly 11f96dbedd] [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]
Former-commit-id: c42ae0fa39
Former-commit-id: 02bef853ef7c7fae6630b12e89ad4d9ef11bc391 [formerly 9f97182964]
Former-commit-id: f2102bfb24
|
2012-07-19 16:20:40 -05:00 |
|
Steve Harris
|
1f521a70b3
|
12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]
Former-commit-id: 97c4db937e
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
98d8b3f188
|
12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]
Former-commit-id: a2a6a18fae
|
2012-04-18 15:18:16 -05:00 |
|
Matt Nash
|
fa4cd88c90
|
Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 21d2361f00 [formerly 1faae42484]
Former-commit-id: 82300ccdcf
|
2012-01-19 11:53:12 -06:00 |
|
root
|
9bb8decbcf
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 377dcd10b9 [formerly 3360eb6c5f]
Former-commit-id: 8e80217e59
|
2012-01-06 08:55:05 -06:00 |
|