Steve Harris
3073951b3d
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: d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e
2013-03-27 22:16:15 -05:00
Steve Harris
6351d8f6d3
Merge branch 'master_13.3.1' (13.3.1-14 cleaned up) into omaha_13.3.1
...
Former-commit-id: 0f0b0a0c0f2f0d334ccd56f8265e2b6fd9a12902
2013-03-27 22:13:11 -05:00
Steve Harris
4d4234d5c9
13.3.1-14 baseline
...
Former-commit-id: e05ab5dbc442d410ae53400f087c02197ba5068b
2013-03-27 22:10:03 -05:00
Roger Ferrel
1129728e03
Issue #1790 Bug fix for dialogs in ticket 1578
...
Change-Id: I472e20ca729d0c4f3510bdd98e5456be47bd2c90
Former-commit-id: 9bc7fe4c771e534148b446d33de969ef53be3b0d
2013-03-27 21:54:26 -05:00
Richard Peter
2b207fc6ec
Merge "Issue #1821 Reduce db and pypies requests in grid assembler." into omaha_13.3.1
...
Former-commit-id: db45bf80d754e49429e4d6a7fd6a28f50d7fb140
2013-03-27 18:32:38 -05:00
Richard Peter
6c4f279623
Merge "Issue #1821 make GridInfoCache more elaborate. Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9" into omaha_13.3.1
...
Former-commit-id: b0753a969f27d0f7903a42a535066e3ac5b354fd
2013-03-27 18:28:01 -05:00
Steve Harris
d997aeaee4
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: 6f42195bd8f6087fb8bb55232082c0ec5f867e12
2013-03-27 18:21:05 -05:00
Ben Steffensmeier
5add905ea7
Issue #1821 Reduce db and pypies requests in grid assembler.
...
Former-commit-id: 68febf5d9bff68e752d039fddc853a0e5793b05d
2013-03-27 17:59:58 -05:00
Steve Harris
9fba973fd0
13.3.1-14 baseline
...
Former-commit-id: 0b52508caf520abeba4a75d38c9ed9130cc12c9e
2013-03-27 17:59:34 -05:00
Ben Steffensmeier
4b6d2fd8d1
Issue #1821 make GridInfoCache more elaborate.
...
Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9
Former-commit-id: c7b4e7c982fb682779b729d1a8a8fb5ff6f5e1d2
2013-03-27 17:28:45 -05:00
Benjamin Phillippe
2a14245dce
Issue #1802 Fixes related to DD transaction refactor
...
Change-Id: Ia2a7a4ce990d424ed1e365bd7003fd2ab8630fd1
Former-commit-id: 393a469e2f65894a6dd5b58c1431c3d727951eda
2013-03-27 17:12:52 -05:00
Richard Peter
70a7c3c556
Merge "Issue #1827 Create registry/datadelivery client features" into omaha_13.3.1
...
Former-commit-id: a104b57c33655022bc142b71e909e8fb1b1c022b
2013-03-27 17:08:00 -05:00
Roger Ferrel
391ce5687b
Issue #1790 Bug fixes for ticket 1353.
...
Change-Id: I36b74546b7f73c669d65a5588e813173ccbd18fc
Former-commit-id: e0c3e3b81f679985a048047b3e5aa69992577d78
2013-03-27 16:56:17 -05:00
Dustin Johnson
1684507bdb
Issue #1827 Create registry/datadelivery client features
...
Amend: Add event plugins and their dependencies to client features
Change-Id: Ib80522161740857d4332b84bbedad10e19683602
Former-commit-id: 0011ef9ba9d014decf30acc2913fa535562d0de2
2013-03-27 15:38:36 -05:00
Roger Ferrel
1093c020e6
Issue #1790 Fix dialog in current phase.
...
Change-Id: I7289fbef264d68b70b606d120cde8daf5fc41e7b
Former-commit-id: 0c1b97f64455c8fcbe2c12848c3a4f58d1d13b54
2013-03-27 14:11:36 -05:00
Ben Steffensmeier
6f525a81b4
Issue #1821 Speed up GridInfoCache.
...
Change-Id: I14a92d85994c25dc7f80828efd12d2d4e2e70e40
Former-commit-id: fde9f936e53a998f8cde174935d00287e6aaf70c
2013-03-27 13:21:33 -05:00
Nate Jensen
f8e5534417
Merge "Issue #1638 Made Map scales more generalized for use outside of D2D" into development
...
Former-commit-id: 5ebb2a9670ef28c759b434ed25e68465b5a2d8ac
2013-03-27 11:32:19 -05:00
Ron Anderson
33d78bc7ee
Merge "Issue #1833 : Add performance log file to ingest and ingestGrib" into omaha_13.3.1
...
Former-commit-id: 9b35437ccfecaf70470a9a96fbc3acacd7cf1405
2013-03-27 11:22:48 -05:00
Nate Jensen
aaf2d7bc2a
Merge "Issue #1832 fix getNumPy() error handling" into omaha_13.3.1
...
Former-commit-id: f1cabae64e37120f27235ec44b4bd7a1921fe621
2013-03-27 11:16:56 -05:00
Mike Duff
302dbf2cfb
Issue #1834 - Filter config file reads for xml only, wrap unmarshalling and log errors
...
Change-Id: I23829b764e1f52e9dee1a1d9701d219e949eb9fa
Former-commit-id: 5304de6fff49f3db7a3b46427077c7d2d9c0b3f9
2013-03-27 10:38:59 -05:00
Richard Peter
b75ceeeeb3
Issue #1833 : Add performance log file to ingest and ingestGrib
...
Change-Id: I650fa5893a31bee6c4f0e96af87754518df6d25d
Former-commit-id: 53cb92842c43349968b70bb5fec5beb100773b63
2013-03-26 20:55:42 -05:00
Nate Jensen
74b21dc1b4
Issue #1832 fix getNumPy() error handling
...
Change-Id: If2a0d3747c38cf716c3fa431c4135f2dee7c5405
Former-commit-id: ce7e89b8300580a57a5c133a78e8c84e2cb7449e
2013-03-26 18:30:19 -05:00
Nate Jensen
b44db0bc2c
Merge "Issue #1735 Performance improvments for LLWSData." into development
...
Former-commit-id: 5ee7c58ea1f95b89bf252edbee02d0560eaa98aa
2013-03-26 16:28:38 -05:00
Nate Jensen
c895ee60fa
Merge "Issue #1791 Fix problems in SmartScript when there is no data." into omaha_13.3.1
...
Former-commit-id: a12ccd946a59dae45a4b5b754655d8eef7a56a29
2013-03-26 16:15:27 -05:00
Richard Peter
cbf915093f
Merge "Issue #1828 Fix intlsigmets and text pattern." into omaha_13.3.1
...
Former-commit-id: e9a9cbc4b3c20dce7dc39837c9aab4ae5ef6e01a
2013-03-26 15:33:33 -05:00
Lee Venable
049e955db9
Merge "Issue #1799 Fix pan/zoom when in views." into omaha_13.3.1
...
Former-commit-id: 69ec257d3a90ffcaa81d92f34ff545d4c49bb1d3
2013-03-26 15:01:51 -05:00
Roger Ferrel
74389834de
Issue #1828 Fix intlsigmets and text pattern.
...
Change-Id: Id5bc5d5738a00ae1607c772bfe1bf675c48db2b0
Former-commit-id: 84448e12d2f09637bc4f79e42f21c11e561b8c37
2013-03-26 14:47:48 -05:00
Ben Steffensmeier
18311b0d18
Issue #1791 Fix problems in SmartScript when there is no data.
...
Former-commit-id: 39d0a9f0cc71f3dbbde69e6d1dac14ef93a78984
2013-03-26 14:46:11 -05:00
Lee Venable
c1adce3a11
Merge "Issue #1819 Added precision fields for point source configuration." into omaha_13.3.1
...
Former-commit-id: 8753aa9e648778c2eabbf959c1b270ebe5add67c
2013-03-26 14:33:24 -05:00
Richard Peter
7ee513dfed
Merge "Issue #1783 : Update DatabaseArchiver to stream deserialization of previous records" into omaha_13.3.1
...
Former-commit-id: b1acf59c03ab308b86843a314d4795f6392de844
2013-03-26 12:59:47 -05:00
Steve Harris
65df96a419
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: 99cd1f52511023794d9dcb21c68720c4e47faec5
2013-03-26 12:47:40 -05:00
Steve Harris
9ff8a94193
Merge branch 'master_13.3.1' into omaha_13.3.1
...
Former-commit-id: 741a32d9209897e84da068626d28c7d7af47f9c1
2013-03-26 12:44:24 -05:00
Steve Harris
c65f3e68e5
13.3.1-13 baseline
...
Former-commit-id: 9c263e3ffc35677d7015158e06b64f376e7f801d
2013-03-26 12:43:07 -05:00
Jonathan Sanchez
b0f61cf86c
Issue #1819 Added precision fields for point source configuration.
...
Former-commit-id: b250ff50f8a2ac6ad8ec91e14735edcd6f053343
2013-03-26 12:29:18 -05:00
Steve Harris
305994e220
Merge "Issue #1782 : Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge." into development
...
Former-commit-id: b59167da8d42b23fadd19eb8f186d992a5c68bdd
2013-03-26 12:27:54 -05:00
David Gillingham
54511a95db
Issue #1782 : Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge.
...
Change-Id: I0833377d1501122200ede42b5ec30ec7bf9b2dfb
Former-commit-id: 497aa460d6119f13bf6870b78454237252b68752
2013-03-26 12:14:22 -05:00
Ben Steffensmeier
6edee13cdd
Issue #1782 fix merge problems related to graphics API.
...
Former-commit-id: 9689a020a25ffdbf8a13abb02506d6e3e4dcdbb8
2013-03-26 12:06:45 -05:00
Ben Steffensmeier
78fdea2ba1
Issue #1799 Fix pan/zoom when in views.
...
Former-commit-id: 2061956526bdc3da43280e6c829de1deb0a098ba
2013-03-26 11:44:23 -05:00
Richard Peter
69ffe80046
Issue #1783 : Update DatabaseArchiver to stream deserialization of previous records
...
Change-Id: Icb1e2721bcddeb93c7c06983bba117c75b0edd44
Former-commit-id: f4e67b7b1b41af66436cae5e6f7f61bbf02fb534
2013-03-26 11:40:24 -05:00
Ron Anderson
f65989454a
Merge "Issue #1823 : Trigger SAT smart inits based only on sector id and physical element." into omaha_13.3.1
...
Former-commit-id: 735c64e77a704ceae7f1a025c9cfc442f48f207e
2013-03-26 11:33:15 -05:00
Richard Peter
f062e43f8c
Merge "Issue #1750 - include the qpidd service script in the rpm installations" into development
...
Former-commit-id: 6c2e1cc597e14997f59c52c344ca7558139f2333
2013-03-26 10:53:50 -05:00
Ben Steffensmeier
7bde9f6d32
Issue #1821 Optimize FFG version query.
...
Former-commit-id: 6d75a1b79cfd46de69db2d3cb452711f3ea1254d
2013-03-26 10:37:40 -05:00
David Gillingham
bebfc60317
Issue #1823 : Trigger SAT smart inits based only on sector id and physical element.
...
Change-Id: I2d8c44ea6dbe9c227e3984f64caf5071b1c62e79
Former-commit-id: 4114f40bee478e8ab004c7b3d5fd7bdd0980bb14
2013-03-26 10:33:42 -05:00
Steve Harris
a23cecdb26
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
Mike Duff
9ebc7606b1
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: 98d23aed31d7226576943b6da0b1a0bcdc1eef58
2013-03-26 09:19:39 -05:00
Ron Anderson
73678261b6
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: 8394ce66975f5915fd82dbc950ce43e5db3cfbe3
2013-03-25 17:53:46 -05:00
Lee Venable
05b4c2f913
Merge "Issue #1605 Check if storm location is over an urban bound area." into omaha_13.3.1
...
Former-commit-id: 65989516cda62a95cb7b6d67bea8aa20138def2a
2013-03-25 17:20:25 -05:00
Lee Venable
d10f1c818d
Merge "Issue #1781 - Constrain the tabular TS query by time." into omaha_13.3.1
...
Former-commit-id: f0ed09e300f81dcf425df64aefcd33b670b7bdd5
2013-03-25 17:02:06 -05:00
Bryan Kowal
21fa510eaa
Issue #1750 - include the qpidd service script in the rpm installations
...
Change-Id: I8b90e0ffb1c0abc49ba55b55f3085c59e9b902de
Former-commit-id: c96c45074c220140b8774e1fceeab2b79820f033
2013-03-25 16:52:33 -05:00
Mike Duff
88e75f4a90
Issue #1781 - Constrain the tabular TS query by time.
...
Change-Id: I648913c157585283cdc96793d18d36933589b3e9
Former-commit-id: 027807d7e4ac171498f267759a4e34f75e1e4d46
2013-03-25 16:03:18 -05:00
