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 |
|
Steve Harris
|
aaac0b51e5
|
13.3.1-12 baseline
Former-commit-id: 1f109861760e5fbc9d7a13cc4f518341cbc31276
|
2013-03-25 13:27:13 -05:00 |
|
Dave Hladky
|
f2e13c8078
|
Issue #1813 Stats for FFMP were broken by memory updates.
Change-Id: Idb213aa4b67760d1dc28f0f34bb473f970438a58
Former-commit-id: 314ec2517a0c5565f8423661cb744e04953f1830
|
2013-03-22 16:37:20 -05:00 |
|
Steve Harris
|
cb5ea76f98
|
Merge branch 'omaha_13.3.1' into development
Conflicts (auto resolved):
cave/com.raytheon.uf.viz.cots.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml
Former-commit-id: 45de49bd241f4bc53b266792c0ae6cb4658527a7
|
2013-03-20 13:45:11 -05:00 |
|
Dave Hladky
|
3cdbfa3f25
|
Issue #1782 Merge branch 'master_13.3.1' (13.3.1-9) into omaha_13.3.1
Conflicts:
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Change-Id: I86cba73da17ae0e057240abcfc2ba84b36a054bb
Former-commit-id: 410c1d3ca42abf207615fb6ab3e8135c6f661461
|
2013-03-20 12:41:33 -05:00 |
|
Steve Harris
|
f2b3fddfe2
|
13.3.1-9 baseline
Former-commit-id: 17276903ed005e17165649f236e6a99afa47b7fb
|
2013-03-19 14:22:56 -05:00 |
|
Steve Harris
|
7fcf9f1cb2
|
Merge branch 'omaha_13.3.1' into development
Conflicts:
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/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Former-commit-id: 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40
|
2013-03-18 16:52:00 -05:00 |
|
Dave Hladky
|
5dc454c7ef
|
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753
|
2013-03-13 13:56:33 -05:00 |
|
Steve Harris
|
e12ed113ae
|
13.3.1-7 baseline
Former-commit-id: aa42eb84d41a7f0577ab8ce8555c0922833f96f1
|
2013-03-13 09:50:28 -05:00 |
|
Max Schenkelberg
|
e0ba97d547
|
Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
Amend: Accepted ticket for work, again! Ensured uframe product project was not deleted
Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719
Former-commit-id: 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b
|
2013-02-27 11:50:38 -06:00 |
|
Dave Hladky
|
41f2ea7efe
|
Issue #1635 Second Guidance source verification, general cleanup
Change-Id: Ie7807a653862335ae50e11337c47c7c7fcbde526
Former-commit-id: 798b106211b1248c7fc932cfb2ebccddf15a0d66
|
2013-02-20 16:13:08 -06:00 |
|
Dave Hladky
|
381aec5976
|
Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT
Change-Id: I693debea540667cfda6efe1496dd1084b8d0e950
Former-commit-id: 2ea8409800917d8c9a4c76c3b63492a2eb1f2c62
|
2013-02-14 13:58:32 -06:00 |
|
Steve Harris
|
a46e33f06e
|
13.2.1-6 baseline
Former-commit-id: 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb
|
2013-02-07 16:00:39 -06:00 |
|
Dave Hladky
|
7af5aab08a
|
Issue #1478 FFMP cache file read/writes overloading NAS, more efficiency
Change-Id: Ib5f49d9c1551b72a3620629437386d52c12b0ecf
Former-commit-id: 9c7d813ee094864e0a7da60d54dee5424c50efba
|
2013-02-05 12:23:56 -06:00 |
|
Steve Harris
|
4ba416aeb3
|
13.1.2-2 baseline
Former-commit-id: 221d0aaf0e19a054387134e72a76a278159bf4d0
|
2013-01-06 14:32:24 -06:00 |
|
Ben Steffensmeier
|
5039e5fa08
|
Issue #1358 fix forced basins and ffmp loading rfc ffg on startup.
Former-commit-id: 901c629add69ab263d041919c45316512718b72a
|
2012-11-28 16:33:15 -06:00 |
|
Ben Steffensmeier
|
e8090e654b
|
Merge branch 'ss_builds'(12.12.1-1) into development
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc
Former-commit-id: 911c845199714c07e93f9847ab00fcd6d28a4223
|
2012-11-13 16:00:19 -06:00 |
|
Steve Harris
|
e1498006c7
|
12.12.1-1 baseline
Former-commit-id: 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535
|
2012-11-07 12:41:20 -06:00 |
|
Richard Peter
|
886375172b
|
Issue #1257: Update PurgeRules to not be hard linked to path keys
Change-Id: I8eb68c527ddafae2ee2b3af8d22eed905f547ea4
Former-commit-id: 73bca27407552c864765d5924e8609a253493f4c
|
2012-10-31 18:19:44 -05:00 |
|
Ben Steffensmeier
|
b3190ba34d
|
Issue #189 switch DAT to grid.
Former-commit-id: a062b80648acb5d7ba664821bb9f65bdf985a971
|
2012-10-01 15:38:53 -05:00 |
|
Ben Steffensmeier
|
05849f634d
|
Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece
Former-commit-id: 8f164a7b948e462b14caf6576de2b898a9a4e880
|
2012-09-18 15:19:05 -05:00 |
|
Steve Harris
|
fc405efab7
|
12.9.1-11 baseline
Former-commit-id: 046d9078b7aa87ff8df98142556713fe38d95c63
|
2012-08-30 14:36:12 -05:00 |
|
Steve Harris
|
cb9b80f3a0
|
12.9.1-10 baseline
Former-commit-id: 32048810bc091d7ba09a321c36cd5a78b2d4bd39
|
2012-08-30 14:28:27 -05:00 |
|
Steve Harris
|
f2fac39428
|
12.9.1-5 baseline
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
33b95fb96d
|
12.9.1-4 baseline
Former-commit-id: df38541c9df38c634626ae214f288b606004a768
|
2012-08-15 15:19:10 -05:00 |
|
Steve Harris
|
cd49ef3eda
|
12.8.1-5 baseline
Former-commit-id: 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f
|
2012-08-01 10:45:37 -05:00 |
|
Steve Harris
|
27afa60345
|
12.6.1-9 baseline
Former-commit-id: 8f93efb93ec2d244fe599c16b3af5b33784c0232
|
2012-07-10 07:53:49 -05:00 |
|
Steve Harris
|
3904c4ccf5
|
12.5.1-15 baseline
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
8485b90ff8
|
12.4.1-10 baseline
Former-commit-id: bf53d06834caa780226121334ac1bcf0534c3f16
|
2012-05-01 18:06:13 -05:00 |
|
Steve Harris
|
2a216f333c
|
12.4.1-4 baseline
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
|
2012-04-18 15:18:16 -05:00 |
|
root
|
06a8b51d6d
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
|
2012-01-06 08:55:05 -06:00 |
|