Steve Harris
02105701a0
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: b0621d90bc
[formerly fd71e44f0f
] [formerly a23cecdb26
[formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]
Former-commit-id: a23cecdb26
Former-commit-id: e96e95b565
2013-03-26 10:12:34 -05:00
Mike Duff
b366778df0
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: c1f7d33bb8
[formerly 5d72795e1b
] [formerly 9ebc7606b1
[formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]
Former-commit-id: 9ebc7606b1
Former-commit-id: 4c3011edce
2013-03-26 09:19:39 -05:00
Ron Anderson
e4c4862938
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: 6ab9303526
[formerly f4f180face
] [formerly 73678261b6
[formerly 8394ce66975f5915fd82dbc950ce43e5db3cfbe3]]
Former-commit-id: 73678261b6
Former-commit-id: 7e6b601a09
2013-03-25 17:53:46 -05:00
Lee Venable
b1ce5603a0
Merge "Issue #1605 Check if storm location is over an urban bound area." into omaha_13.3.1
...
Former-commit-id: a84ef2d2c3
[formerly e467daec0c
] [formerly 05b4c2f913
[formerly 65989516cda62a95cb7b6d67bea8aa20138def2a]]
Former-commit-id: 05b4c2f913
Former-commit-id: d73b44fa67
2013-03-25 17:20:25 -05:00
Mike Duff
fc0b126eee
Issue #1781 - Constrain the tabular TS query by time.
...
Change-Id: I648913c157585283cdc96793d18d36933589b3e9
Former-commit-id: 3d783c54be
[formerly afd0de8b5b
] [formerly 88e75f4a90
[formerly 027807d7e4ac171498f267759a4e34f75e1e4d46]]
Former-commit-id: 88e75f4a90
Former-commit-id: b517ce9a9f
2013-03-25 16:03:18 -05:00
Jonathan Sanchez
cd1095fb29
Issue #1605 Check if storm location is over an urban bound area.
...
Former-commit-id: 3ca4cc9dcf
[formerly 06cd161d0e
] [formerly ddcb4f3451
[formerly 2d58fc8149587bdc089db2b8a69f2a176c24ba23]]
Former-commit-id: ddcb4f3451
Former-commit-id: c9295e6762
2013-03-25 14:41:55 -05:00
Lee Venable
4caa21aa69
Merge "Issue #1810 Accepted other values/types for useDirs." into omaha_13.3.1
...
Former-commit-id: 5d7055ad53
[formerly 25cf1cacfd
] [formerly d1c84de620
[formerly 2e5dbf15665e3c1229604f2ae7cbfd76dacd3903]]
Former-commit-id: d1c84de620
Former-commit-id: fc41aa82ca
2013-03-25 14:08:39 -05:00
Steve Harris
f80f98cee2
13.3.1-12 baseline
...
Former-commit-id: be96282207
[formerly 0be473728a
] [formerly aaac0b51e5
[formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: aaac0b51e5
Former-commit-id: bc439aee4f
2013-03-25 13:27:13 -05:00
Jonathan Sanchez
e01d47acfa
Issue #1810 Accepted other values/types for useDirs.
...
Former-commit-id: 2d6be3d3da
[formerly d00c88a38c
] [formerly b77ed18eb4
[formerly 7492d4e2ceea99c71f8040237610d95e45c1e78a]]
Former-commit-id: b77ed18eb4
Former-commit-id: 539c4dfa8e
2013-03-25 12:23:51 -05:00
Mike Duff
fcb46897e3
Issue #1818 - Added an isDisposed check to the Attributes Dialog open action
...
Change-Id: Icb0c6fd5112cc11b796aaa74c8afc9b10760f2dc
Former-commit-id: 86e0184414
[formerly 593cb668bf
] [formerly 7118f04843
[formerly c0e79f8fa9cfd55a86d48130fa7ff448ae5231b0]]
Former-commit-id: 7118f04843
Former-commit-id: c682fb2e9a
2013-03-24 12:21:51 -05:00
Richard Peter
d1b4d899be
Merge "Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe." into development
...
Former-commit-id: bb2be2d6a7
[formerly 1b7e9e41ce
] [formerly 3de0400969
[formerly a009dd098e1a13ec445cbdc3757771f576d3acc0]]
Former-commit-id: 3de0400969
Former-commit-id: 50254dc8d1
2013-03-22 16:26:52 -05:00
Dustin Johnson
c55f2ce559
Merge "Issue #1815 Move DD phase3 code to 5-Data_Delivery" into development
...
Former-commit-id: f5cc517f9a
[formerly dcfbb43eb3
] [formerly 8651ca3d76
[formerly 7a5674416084a17bf2fbbbc666cba01bb7338eff]]
Former-commit-id: 8651ca3d76
Former-commit-id: 0596d43d99
2013-03-22 15:28:57 -05:00
Dustin Johnson
f274b8cd5b
Merge "Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription" into development
...
Former-commit-id: ec42bd63ad
[formerly 11478e870d
] [formerly ed017996a0
[formerly feee3e80a7b2aafd9ddf1af0802a829726f50a69]]
Former-commit-id: ed017996a0
Former-commit-id: 9e63142576
2013-03-22 15:28:20 -05:00
Max Schenkelberg
850c8995cc
Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe.
...
Amend: Moved Pair class into uf.common.util to reduce amount of duplicate code
Amend: Added hashCode/equals to Pair
Change-Id: I9a390989f6a7a7ee6618a57d0f50ec681a598dc0
Former-commit-id: 07ae94c499
[formerly ea26d0de84
] [formerly 126be0cfe5
[formerly eb1dd65cfdcd50b450174a1ca4ef2f2d1e1b9bae]]
Former-commit-id: 126be0cfe5
Former-commit-id: d20958ae92
2013-03-22 10:54:44 -05:00
David Gillingham
c8c7fb4129
Issue #1447 : Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for
...
localVTECPartners.py to ServiceBackup.
Change-Id: Ie91d342c113c59d0e97b86349f75d657f1cf40f3
Former-commit-id: 8438c5af87
[formerly 79a1520baf
] [formerly 4aeeb1ce25
[formerly 0b047a505ce4ed442af9de3a3cfeea5bf1e6c872]]
Former-commit-id: 4aeeb1ce25
Former-commit-id: c3ce4058a0
2013-03-22 10:39:13 -05:00
Dustin Johnson
53291f7130
Issue #1815 Move DD phase3 code to 5-Data_Delivery
...
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425
Former-commit-id: 6fc42b0791
[formerly 8956d1ac17
] [formerly 04cbd3a24e
[formerly 126661592c42e16a07451868b87a33cff2a89cd1]]
Former-commit-id: 04cbd3a24e
Former-commit-id: 1b1bd69b89
2013-03-22 10:04:21 -05:00
Lee Venable
a2e5e18810
Merge "Issue #1806 Update GL mosaicing to use dynamic data format for offscreen textures. Change-Id: Ib756f4ce978ace6fae41dd407ab9187cd6b70d51" into omaha_13.3.1
...
Former-commit-id: 5c8230662d
[formerly 489e04c235
] [formerly c8523e9108
[formerly d5231f950c637b8a094b0a60b25a629f0b3644fa]]
Former-commit-id: c8523e9108
Former-commit-id: 0d1cba8eae
2013-03-21 19:27:02 -05:00
Nate Jensen
fa0d772221
Merge "Issue #1638 Created AWIPSWorkbenchAdvisor which sends MenuCreation request to run so core cave applications will not depend on uf.edex.menus being deployed in EDEX. Changed DbQuery to use DbQueryRequest under the hood to remove dependency on ScriptCreator." into development
...
Former-commit-id: 5728a3e5b6
[formerly e4c1e86d55
] [formerly 44f8ba8943
[formerly 805fae0df3b82e1e16a931741d22bf7637e6aa06]]
Former-commit-id: 44f8ba8943
Former-commit-id: 84e8a30ad7
2013-03-21 17:06:37 -05:00
Dustin Johnson
09d1d7b6cf
Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription
...
Amend:
Add constant for "CAVE".
Add preconditions on creating a subscription.
Change-Id: Icdd2bc0ebd1613724cea3a89d335415995e18cae
Former-commit-id: bd58534855
[formerly f8870c8946
] [formerly c4d4e37cad
[formerly 9a3bf6b1e59acea76f7f7973a599bc32c0d395f2]]
Former-commit-id: c4d4e37cad
Former-commit-id: d58306a92e
2013-03-21 16:14:49 -05:00
Nate Jensen
7ce724d4fd
Merge "Issue #1808 perspective specific actions take priority" into development
...
Former-commit-id: 113da23467
[formerly d6d7b081cf
] [formerly 255b2dbd29
[formerly 0c710437147f3a1b242f93a4c63c2451d5724f3e]]
Former-commit-id: 255b2dbd29
Former-commit-id: 7821b86e87
2013-03-21 15:07:57 -05:00
Mike Duff
524dfa985f
Issue #1812 - Scan/DMD trend graphs and trend sets graphs update on threshold changes.
...
Change-Id: I1150f365ef7b67a198f57cca85859f6767eb0234
Former-commit-id: 540524941d
[formerly e4ffefa649
] [formerly 09feff70e0
[formerly 8ddcbfac38c225c6771e97de738125a1149ae1c4]]
Former-commit-id: 09feff70e0
Former-commit-id: a45389f735
2013-03-21 12:23:56 -05:00
Ben Steffensmeier
4323ea54d2
Issue #1806 Update GL mosaicing to use dynamic data format for offscreen textures.
...
Change-Id: Ib756f4ce978ace6fae41dd407ab9187cd6b70d51
Former-commit-id: 3cc175f373
[formerly e69011cdd8
] [formerly de02fe7922
[formerly 26baf1550ad70417a68bd0a36ea99ac83c6d39cd]]
Former-commit-id: de02fe7922
Former-commit-id: 6ce135a80a
2013-03-21 11:09:23 -05:00
Max Schenkelberg
9aa8f9dd9e
Issue #1638 Created AWIPSWorkbenchAdvisor which sends MenuCreation request to run so core cave applications will not depend on uf.edex.menus being deployed in EDEX. Changed DbQuery to use DbQueryRequest under the hood to remove dependency on ScriptCreator.
...
Amend: Added header comments and more unused code
Change-Id: Ib9285d0472e41473ba79bbada8ea2bf57b55d686
Former-commit-id: 3bda2ba497
[formerly b2e374c7fb
] [formerly 5109641194
[formerly e40808621cfee3cabe6b6cf124440632ef08d5d7]]
Former-commit-id: 5109641194
Former-commit-id: 21b8c130c2
2013-03-20 17:38:02 -05:00
Bryan Kowal
63f7abc798
Merge "Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE." into development
...
Former-commit-id: 820518ffb9
[formerly 0479eb0cc1
] [formerly 3baebb684b
[formerly 582f5f0fe2e348ea5ec3fe75a66b2ccbce431515]]
Former-commit-id: 3baebb684b
Former-commit-id: 374bd51fb0
2013-03-20 16:53:18 -05:00
Nate Jensen
5acc1d6835
Issue #1808 perspective specific actions take priority
...
Change-Id: I21f5515fe0c2a480dee9950bacbc2b06fd084072
Former-commit-id: 00f750ae06
[formerly c1ddc02b10
] [formerly de3aea9afb
[formerly d69f2087948a54618c6f22878d575b6760950909]]
Former-commit-id: de3aea9afb
Former-commit-id: a5f4b4f0ad
2013-03-20 16:27:31 -05:00
Steve Harris
8db98c2d71
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 0055a3213d
[formerly e2496455b2
] [formerly 0379be06d2
[formerly 67b25fa95817acafd25818c825656236597b6e09]]
Former-commit-id: 0379be06d2
Former-commit-id: 4fc2bb7bba
2013-03-20 16:09:26 -05:00
Steve Harris
f4e26fd94d
Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: a9ced3a7ef
[formerly fa15f03e1b
] [formerly dc419068f0
[formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]
Former-commit-id: dc419068f0
Former-commit-id: 31044eabd1
2013-03-20 16:06:20 -05:00
Steve Harris
e9f0328808
13.3.1-10 baseline
...
Former-commit-id: 57f4676b6c
[formerly 073687d9a9
] [formerly 7078eec1b1
[formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]
Former-commit-id: 7078eec1b1
Former-commit-id: 7c2e617d26
2013-03-20 15:53:01 -05:00
Max Schenkelberg
ec27a16858
Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE.
...
Change-Id: I177804512c34603bae0027edfa420de47d23138e
Former-commit-id: 43341e7ad3
[formerly c6db3ce43b
] [formerly 26cfcd2af5
[formerly d9cc808839d4a3210381329eec4f73e061be9968]]
Former-commit-id: 26cfcd2af5
Former-commit-id: 2e10fd83f6
2013-03-20 14:10:52 -05:00
Steve Harris
d00dc0d174
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: 310474ae9b
[formerly 36df63be5c
] [formerly cb5ea76f98
[formerly 45de49bd241f4bc53b266792c0ae6cb4658527a7]]
Former-commit-id: cb5ea76f98
Former-commit-id: 104e6e79e8
2013-03-20 13:45:11 -05:00
Richard Peter
53d8ef7ed1
Merge "Issue #1804 Remove empty data structures from radar hdf5. Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d" into omaha_13.3.1
...
Former-commit-id: d1e37c7803
[formerly 3b8e2ff0d3
] [formerly adbe7b91cc
[formerly 186e08826a1a9860bd38c5dd10465b38721218f2]]
Former-commit-id: adbe7b91cc
Former-commit-id: 3bad342dca
2013-03-20 13:32:33 -05:00
Ben Steffensmeier
1b363a547c
Issue #1804 Remove empty data structures from radar hdf5.
...
Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d
Former-commit-id: 1203b7cee4
[formerly ee7204c05c
] [formerly 82499f839d
[formerly 31528bbb403ec0fd6ee792f4451ac209fb272dcd]]
Former-commit-id: 82499f839d
Former-commit-id: 3e2a41d1d2
2013-03-20 13:26:33 -05:00
Ben Steffensmeier
b201d9dee2
Issue #1804 Switch bzip2 cots package to jbzip2.
...
Former-commit-id: 0d9119a1c7
[formerly 2b6aa86371
] [formerly ed544fc17c
[formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]]
Former-commit-id: ed544fc17c
Former-commit-id: 646b61f653
2013-03-20 13:05:54 -05:00
Dave Hladky
01c6ff12a0
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: dc7b231bf0
[formerly 90f7f2110b
] [formerly 3cdbfa3f25
[formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]]
Former-commit-id: 3cdbfa3f25
Former-commit-id: bd17b99bd1
2013-03-20 12:41:33 -05:00
Steve Harris
7e96d841d9
13.3.1-9 baseline
...
Former-commit-id: c7b2ef2d8c
[formerly 468ae82305
] [formerly f2b3fddfe2
[formerly 17276903ed005e17165649f236e6a99afa47b7fb]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 0375805e79
2013-03-19 14:22:56 -05:00
Richard Peter
eebd930070
Merge "Issue #1804 Remove AlphanumericValues from radar HDF5." into omaha_13.3.1
...
Former-commit-id: 2fdbc96342
[formerly 4ce10bced9
] [formerly 3a92747518
[formerly ea39cfcb15ca583ac43f5d101b9364f52900128d]]
Former-commit-id: 3a92747518
Former-commit-id: c955b3b640
2013-03-19 13:24:28 -05:00
Dustin Johnson
3c8e14edc7
Merge "Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development
...
Former-commit-id: bc323d3f25
[formerly 5b4035fb11
] [formerly 8363eba409
[formerly 9761b41160000713d00113c5267badafc9613a0d]]
Former-commit-id: 8363eba409
Former-commit-id: e0b6e6187e
2013-03-19 13:09:48 -05:00
Dave Hladky
618f737fab
Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
...
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d
Former-commit-id: d7e8709cde
[formerly ddb23ae59f
] [formerly 81ad1ce2ed
[formerly a52596494feb2255269513a3cd19490628d4ae10]]
Former-commit-id: 81ad1ce2ed
Former-commit-id: f0244f54a4
2013-03-19 13:08:14 -05:00
Mike Duff
3e1b4ba54b
Issue #1457 - Fix mpe problems - displaying gages on map and running fieldgen
...
Change-Id: I9c341235d0d9bfcf6b9b04aeed2ac2a1d96136ff
Former-commit-id: 70efff8f0a
[formerly b115d3611c
] [formerly 058064ce0d
[formerly 7fc127dfaacc36b4051fa5a46774c2823b1d42b2]]
Former-commit-id: 058064ce0d
Former-commit-id: 7e66c8e46d
2013-03-19 10:10:01 -05:00
Bryan Kowal
fd68cd7a04
Issue #1805 - slightly modified viz feature build order
...
Change-Id: I39da0557224a06f4d945ec496c8381bcf0197569
Former-commit-id: 6106369d4c
[formerly f325038538
] [formerly f0eb7d3285
[formerly 8c16b88062116de5e780471fc2f0415cb6dbedfe]]
Former-commit-id: f0eb7d3285
Former-commit-id: 54113e9b29
2013-03-18 18:15:26 -05:00
Ben Steffensmeier
160b6a7040
Issue #1804 Remove AlphanumericValues from radar HDF5.
...
Former-commit-id: 7b7b708eee
[formerly 6c741a9ab3
] [formerly 86dffab17d
[formerly 2c8170a332994405820a25d9052afd7bc8cbcd3f]]
Former-commit-id: 86dffab17d
Former-commit-id: dfe8de96f2
2013-03-18 17:16:44 -05:00
Steve Harris
2a26783ba7
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: 28ef804e1b
[formerly b8f0635ad6
] [formerly 7fcf9f1cb2
[formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 900b9aadde
2013-03-18 16:52:00 -05:00
Steve Harris
ea27f9cd17
Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
...
Conflicts (just history comments):
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 27c418812f
[formerly 1a999fee5a
] [formerly c18b96dc4c
[formerly 5927ff20543395733d9302eba2e6772315730a80]]
Former-commit-id: c18b96dc4c
Former-commit-id: 245afb28c8
2013-03-18 16:43:22 -05:00
Bryan Kowal
3e8d5449fc
Issue #1741 - what was once two is now one
...
- a single awips2-common-base rpm is now built for the com.raytheon.uf.common.base.feature feature
- this rpm will install the CAVE and/or EDEX artifacts
Former-commit-id: a93dcff1b5
[formerly b954bc17bf
] [formerly 7fd035256d
[formerly 99f92bf3c9e8c3e767ec25bc8fb370e53ec43f50]]
Former-commit-id: 7fd035256d
Former-commit-id: 66e2ed79ec
2013-03-18 16:36:33 -05:00
Steve Harris
81a3f29afc
13.3.1-8 baseline
...
Former-commit-id: bc9df0a8f9
[formerly f97d78994b
] [formerly c15b3ffe20
[formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]
Former-commit-id: c15b3ffe20
Former-commit-id: 5f492500ea
2013-03-18 15:43:32 -05:00
Dustin Johnson
7afc4a083b
Merge "Issue #1794 Consolidate common filename filters into FilenameFilters class" into development
...
Former-commit-id: 36cc80590c
[formerly b7a5311dde
] [formerly 7fe3c254fd
[formerly b131f5a534cf143b243c5748e450c09c6c72bdf3]]
Former-commit-id: 7fe3c254fd
Former-commit-id: 55095f0041
2013-03-15 16:14:17 -05:00
Dustin Johnson
7adf94e9f6
Issue #1794 Consolidate common filename filters into FilenameFilters class
...
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36
Former-commit-id: fff7e7983f
[formerly ecb0d2c826
] [formerly 43a9f608ef
[formerly 0e4c9f6ef22bf59f18ce3aab6539c52192539106]]
Former-commit-id: 43a9f608ef
Former-commit-id: 1b82ad0dc4
2013-03-15 11:51:58 -05:00
Roger Ferrel
382bb7c16b
Issue #1790 changes for non-blocking StationLegendDlg.
...
Change-Id: Ie3d632cf8f1a6f0e85b3b4758afe236f3022e91d
Former-commit-id: dadf8a9e4c
[formerly 0089e24579
] [formerly b01bb935c3
[formerly 4ea3b9869a2e0d2c62d519b1fb32dc335b5e0ae0]]
Former-commit-id: b01bb935c3
Former-commit-id: 08990f97f8
2013-03-15 10:26:30 -05:00
Roger Ferrel
e88e52e406
Issue #1790 changes for non-blocking StaffGageDlg.
...
Change-Id: I37d1d2358a91b1f8720888543fb5e05d9ce55092
Former-commit-id: fcbda4e0de
[formerly 4230e1a9b8
] [formerly 17a41bf063
[formerly e9f07f25bd8064925eb9a387f2f8a79ddac15861]]
Former-commit-id: 17a41bf063
Former-commit-id: 006062502e
2013-03-15 09:00:00 -05:00
Roger Ferrel
60e7b4be62
Issue #1790 changes for non-blocking PointPrecipAccumDlg and RiverSummaryDlg.
...
Change-Id: I96e958225b32ba818743d69d77e6bb5cbdc5a13c
Former-commit-id: 76507ebcc5
[formerly 015fc9b8f8
] [formerly 34ea46099e
[formerly ad772f0a3eb944117614f029a2c3659e5c774599]]
Former-commit-id: 34ea46099e
Former-commit-id: 7eae71038f
2013-03-15 08:17:50 -05:00