Steve Harris
069ee8a748
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml
Former-commit-id: 3073951b3d9a321b6ac8
2013-03-27 22:16:15 -05:00
Steve Harris
c284261dc2
Merge branch 'master_13.3.1' (13.3.1-14 cleaned up) into omaha_13.3.1
...
Former-commit-id: 6351d8f6d33cb15755a8
2013-03-27 22:13:11 -05:00
Steve Harris
6a4bbd9f1a
13.3.1-14 baseline
...
Former-commit-id: 4d4234d5c9c29076949e
2013-03-27 22:10:03 -05:00
Roger Ferrel
5bd60ce50c
Issue #1790 Bug fix for dialogs in ticket 1578
...
Change-Id: I472e20ca729d0c4f3510bdd98e5456be47bd2c90
Former-commit-id: 1129728e03a8410499bc
2013-03-27 21:54:26 -05:00
Richard Peter
642ff5e320
Merge "Issue #1821 Reduce db and pypies requests in grid assembler." into omaha_13.3.1
...
Former-commit-id: 2b207fc6ec3ba331e9f5
2013-03-27 18:32:38 -05:00
Richard Peter
2a71b9de1b
Merge "Issue #1821 make GridInfoCache more elaborate. Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9" into omaha_13.3.1
...
Former-commit-id: 6c4f2796237992b43a7a
2013-03-27 18:28:01 -05:00
Steve Harris
979d6a5d8c
Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Change-Id: I6b2513155d566aa09571c280b46cf309028a9861
Former-commit-id: d997aeaee42a0e399dc8
2013-03-27 18:21:05 -05:00
Ben Steffensmeier
6171d60f44
Issue #1821 Reduce db and pypies requests in grid assembler.
...
Former-commit-id: 5add905ea760d13f2282
2013-03-27 17:59:58 -05:00
Steve Harris
91a5e4578e
13.3.1-14 baseline
...
Former-commit-id: 9fba973fd09022c500ce
2013-03-27 17:59:34 -05:00
Ben Steffensmeier
a31dc1874b
Issue #1821 make GridInfoCache more elaborate.
...
Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9
Former-commit-id: 4b6d2fd8d1bc8729d631
2013-03-27 17:28:45 -05:00
Benjamin Phillippe
30be5ce6f9
Issue #1802 Fixes related to DD transaction refactor
...
Change-Id: Ia2a7a4ce990d424ed1e365bd7003fd2ab8630fd1
Former-commit-id: 2a14245dce115dc12790
2013-03-27 17:12:52 -05:00
Richard Peter
c11b070571
Merge "Issue #1827 Create registry/datadelivery client features" into omaha_13.3.1
...
Former-commit-id: 70a7c3c556c8ae09ab1d
2013-03-27 17:08:00 -05:00
Roger Ferrel
9b527de11a
Issue #1790 Bug fixes for ticket 1353.
...
Change-Id: I36b74546b7f73c669d65a5588e813173ccbd18fc
Former-commit-id: 391ce5687b04b57a8582
2013-03-27 16:56:17 -05:00
Dustin Johnson
fbcfdd0ca1
Issue #1827 Create registry/datadelivery client features
...
Amend: Add event plugins and their dependencies to client features
Change-Id: Ib80522161740857d4332b84bbedad10e19683602
Former-commit-id: 1684507bdb52c27ec57f
2013-03-27 15:38:36 -05:00
Roger Ferrel
a0a86f9b13
Issue #1790 Fix dialog in current phase.
...
Change-Id: I7289fbef264d68b70b606d120cde8daf5fc41e7b
Former-commit-id: 1093c020e6d69674d595
2013-03-27 14:11:36 -05:00
Ben Steffensmeier
bd35a06d51
Issue #1821 Speed up GridInfoCache.
...
Change-Id: I14a92d85994c25dc7f80828efd12d2d4e2e70e40
Former-commit-id: 6f525a81b42a13abd32c
2013-03-27 13:21:33 -05:00
Nate Jensen
7f5b3d6f84
Merge "Issue #1638 Made Map scales more generalized for use outside of D2D" into development
...
Former-commit-id: f8e5534417faf937d3b0
2013-03-27 11:32:19 -05:00
Ron Anderson
60735ddd83
Merge "Issue #1833 : Add performance log file to ingest and ingestGrib" into omaha_13.3.1
...
Former-commit-id: 33d78bc7ee841a69ed59
2013-03-27 11:22:48 -05:00
Nate Jensen
caeb823043
Merge "Issue #1832 fix getNumPy() error handling" into omaha_13.3.1
...
Former-commit-id: aaf2d7bc2add3601a873
2013-03-27 11:16:56 -05:00
Mike Duff
1beb6e4fa5
Issue #1834 - Filter config file reads for xml only, wrap unmarshalling and log errors
...
Change-Id: I23829b764e1f52e9dee1a1d9701d219e949eb9fa
Former-commit-id: 302dbf2cfb1958700112
2013-03-27 10:38:59 -05:00
Richard Peter
25d4905570
Issue #1833 : Add performance log file to ingest and ingestGrib
...
Change-Id: I650fa5893a31bee6c4f0e96af87754518df6d25d
Former-commit-id: b75ceeeeb35287a3296b
2013-03-26 20:55:42 -05:00
Nate Jensen
dc53db5181
Issue #1832 fix getNumPy() error handling
...
Change-Id: If2a0d3747c38cf716c3fa431c4135f2dee7c5405
Former-commit-id: 74b21dc1b4e4cdfe0ca9
2013-03-26 18:30:19 -05:00
Nate Jensen
5624e303a8
Merge "Issue #1735 Performance improvments for LLWSData." into development
...
Former-commit-id: b44db0bc2cff7631d847
2013-03-26 16:28:38 -05:00
Nate Jensen
807d8773ad
Merge "Issue #1791 Fix problems in SmartScript when there is no data." into omaha_13.3.1
...
Former-commit-id: c895ee60faf3fd91c311
2013-03-26 16:15:27 -05:00
Richard Peter
ac3619cc77
Merge "Issue #1828 Fix intlsigmets and text pattern." into omaha_13.3.1
...
Former-commit-id: cbf915093ffa7fb4765f
2013-03-26 15:33:33 -05:00
Lee Venable
ad1983ff8d
Merge "Issue #1799 Fix pan/zoom when in views." into omaha_13.3.1
...
Former-commit-id: 049e955db91a59204892
2013-03-26 15:01:51 -05:00
Roger Ferrel
6a4bd66abc
Issue #1828 Fix intlsigmets and text pattern.
...
Change-Id: Id5bc5d5738a00ae1607c772bfe1bf675c48db2b0
Former-commit-id: 74389834de19074d3053
2013-03-26 14:47:48 -05:00
Ben Steffensmeier
9d9443644c
Issue #1791 Fix problems in SmartScript when there is no data.
...
Former-commit-id: 18311b0d186870045005
2013-03-26 14:46:11 -05:00
Lee Venable
68e767daaa
Merge "Issue #1819 Added precision fields for point source configuration." into omaha_13.3.1
...
Former-commit-id: c1adce3a11c86daf885b
2013-03-26 14:33:24 -05:00
Richard Peter
ce83569845
Merge "Issue #1783 : Update DatabaseArchiver to stream deserialization of previous records" into omaha_13.3.1
...
Former-commit-id: 7ee513dfedb947a52604
2013-03-26 12:59:47 -05:00
Steve Harris
4e54025fcd
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 65df96a4195fcfaf4360
2013-03-26 12:47:40 -05:00
Steve Harris
85104939ac
Merge branch 'master_13.3.1' into omaha_13.3.1
...
Former-commit-id: 9ff8a94193e71c69c383
2013-03-26 12:44:24 -05:00
Steve Harris
792171756f
13.3.1-13 baseline
...
Former-commit-id: c65f3e68e5c77a452f5a
2013-03-26 12:43:07 -05:00
Jonathan Sanchez
a0a0199266
Issue #1819 Added precision fields for point source configuration.
...
Former-commit-id: b0f61cf86c79d87a96e7
2013-03-26 12:29:18 -05:00
Steve Harris
9ed8f85b79
Merge "Issue #1782 : Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge." into development
...
Former-commit-id: 305994e2201f28f6b807
2013-03-26 12:27:54 -05:00
David Gillingham
6fe3d5dc28
Issue #1782 : Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge.
...
Change-Id: I0833377d1501122200ede42b5ec30ec7bf9b2dfb
Former-commit-id: 54511a95dbc5c7e31983
2013-03-26 12:14:22 -05:00
Ben Steffensmeier
0aad550439
Issue #1782 fix merge problems related to graphics API.
...
Former-commit-id: 6edee13cdd2b898e58c7
2013-03-26 12:06:45 -05:00
Ben Steffensmeier
d06f011de0
Issue #1799 Fix pan/zoom when in views.
...
Former-commit-id: 78fdea2ba1643c1c77d0
2013-03-26 11:44:23 -05:00
Richard Peter
9773208ff5
Issue #1783 : Update DatabaseArchiver to stream deserialization of previous records
...
Change-Id: Icb1e2721bcddeb93c7c06983bba117c75b0edd44
Former-commit-id: 69ffe80046f3844dd2fb
2013-03-26 11:40:24 -05:00
Ron Anderson
f272034fde
Merge "Issue #1823 : Trigger SAT smart inits based only on sector id and physical element." into omaha_13.3.1
...
Former-commit-id: f65989454a57c919bc7b
2013-03-26 11:33:15 -05:00
Richard Peter
260b159f1b
Merge "Issue #1750 - include the qpidd service script in the rpm installations" into development
...
Former-commit-id: f062e43f8c0f15b13b86
2013-03-26 10:53:50 -05:00
Ben Steffensmeier
54b9d0d949
Issue #1821 Optimize FFG version query.
...
Former-commit-id: 7bde9f6d323049bc94c9
2013-03-26 10:37:40 -05:00
David Gillingham
ad357638b3
Issue #1823 : Trigger SAT smart inits based only on sector id and physical element.
...
Change-Id: I2d8c44ea6dbe9c227e3984f64caf5071b1c62e79
Former-commit-id: bebfc603171df8d39919
2013-03-26 10:33:42 -05:00
Steve Harris
b0621d90bc
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: a23cecdb26fd71e44f0f
2013-03-26 10:12:34 -05:00
Mike Duff
c1f7d33bb8
Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
edexOsgi/build.edex/edex/allElements.xml
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParm.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/GridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/awips2.qpid/0.7/build.sh
rpms/awips2.qpid/build.sh
Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb
Former-commit-id: 9ebc7606b15d72795e1b
2013-03-26 09:19:39 -05:00
Ron Anderson
6ab9303526
Merge "Issue #1447 : Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for localVTECPartners.py to ServiceBackup." into omaha_13.3.1
...
Former-commit-id: 73678261b6f4f180face
2013-03-25 17:53:46 -05:00
Lee Venable
a84ef2d2c3
Merge "Issue #1605 Check if storm location is over an urban bound area." into omaha_13.3.1
...
Former-commit-id: 05b4c2f913e467daec0c
2013-03-25 17:20:25 -05:00
Lee Venable
952a8073fd
Merge "Issue #1781 - Constrain the tabular TS query by time." into omaha_13.3.1
...
Former-commit-id: d10f1c818d74188d09ad
2013-03-25 17:02:06 -05:00
Bryan Kowal
233f2c54be
Issue #1750 - include the qpidd service script in the rpm installations
...
Change-Id: I8b90e0ffb1c0abc49ba55b55f3085c59e9b902de
Former-commit-id: 21fa510eaac3936dd50e
2013-03-25 16:52:33 -05:00
Mike Duff
3d783c54be
Issue #1781 - Constrain the tabular TS query by time.
...
Change-Id: I648913c157585283cdc96793d18d36933589b3e9
Former-commit-id: 88e75f4a90afd0de8b5b
2013-03-25 16:03:18 -05:00
