Rici.Yu
347270c10d
ASM #18606 - check in Maps.py change from Shannon
...
Change-Id: Ie6c06d9d3f788004c1230de98f94aab832ca75a5
Former-commit-id: dbfb33aa6575b02212feefe31cbecb51f3da56ec
2016-02-08 11:40:07 -05:00
Yun.Teng
3c02c9885a
ASM #13261 - Change an alertviz message in PFM formatter
...
Change-Id: Ia0f2f553076e3ca022ef13a4802163776ac26279
Former-commit-id: b88cd2dece4fed8608cf3f56998ab115ba06f6fb
2016-02-02 19:20:49 +00:00
Ana Rivera
41c9e86971
VLab Issue #14152 : Add Sky, Wind for GFSLAMPGrid to GFE (set_2:Fix typo in GFSLAMPGrid.py); fixes #14152
...
Change-Id: Idedce2d1a107ea2dc1b4b21054a6f8e09e42cc88
Former-commit-id: d7a78b8223bf9b4c4f7846da53747c0f137d601a
2016-02-02 13:57:39 +00:00
Steve Harris
85055fcc53
Merge branch 'omaha_16.2.1' into omaha_16.2.2
...
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatedata/ClimateDataMenuDlg.java
cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 68c13f9160746f365bd5f896b1400f1a8099ebe8
2016-02-01 11:57:52 -06:00
Ana Rivera
2c55e2c73e
Merge branch 'master_16.2.1'(OB_16.2.1-8) into field_16.2.1
...
Change-Id: Iacbb253a6326aef1a6cd4d3248e70752c60a926c
Former-commit-id: ea3e5bbb881579737ec9973e6d306b3c9b6f508d
2016-02-01 15:20:44 +00:00
Ana Rivera
c10d68e689
Merge branch 'master_16.1.2' into tcv_16.1.2
...
Change-Id: I2af0dba1d21aa045890559f51cba12fcb4b0f335
Former-commit-id: 1f4c836a341afab4728dd9462139fed44e7b454c
2016-01-28 15:54:43 +00:00
Shawn.Hooper
9efc850e4a
Merge remote-tracking branch 'vlab/tcv_16.1.2' into master_16.1.2
...
Former-commit-id: fe5781c930e4cab0ece462f9ae6152b1d4f4633c
2016-01-26 17:16:15 -05:00
Sarah Pontius
da545043c9
VLab Issue #15111 - TCV and HLS Revisions; fixes #15111
...
Change-Id: I013d6f23d30fb7471923fe1ad3883f4329b77cbf
Former-commit-id: fc7322a5615887e12ddd5364ed593b7d3595b967
2016-01-26 11:40:15 -07:00
Shawn.Hooper
2861d7abd7
Merge tag 'OB_16.1.2-14' into master_16.2.1
...
16.1.2-14
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Change-Id: If4483610b92d4c2ef975c3ac75403e12a70d612c
Former-commit-id: 66d3cd35731e59996c34f003e42cbb2a41010717
2016-01-25 14:32:31 -05:00
Ana Rivera
e42a5384a3
Merge branch 'master_16.2.1'(OB_16.2.1-6) into field_16.2.1
...
Fixed serverConfig.py conflict in History comment.
Change-Id: I3b5348aa8f73deb29163c4c06fb94da0318c415b
Former-commit-id: 4e26e38a9e0cb8b24d8d9f722e35592a8a991ab0
2016-01-22 13:53:50 +00:00
Shawn.Hooper
3f05c3da44
Merge remote-tracking branch 'vlab/field_16.2.1' into master_16.2.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I279d046dc8a054563c9ddabd92350f8d97222355
Former-commit-id: f9ff90f121eff9ae632b8bcc47c3500d9f647d00
2016-01-20 16:49:53 -05:00
Steve Harris
11a5db155d
Merge branch 'omaha_16.2.1' into omaha_16.2.2
...
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/common/FSSObsConfig.java
Former-commit-id: 218244406e4be6cb31b3986ff6457398a0a00bb5
2016-01-20 15:23:43 -06:00
Ana Rivera
35b00be61e
Merge branch 'master_16.2.1' into field_16.2.1
...
Change-Id: I197477fc4ceeb0efbd47335a98df7a2bedb703e0
Former-commit-id: 521d1a43251c5c8a697eccd7d09965dee58fd50b
2016-01-15 16:09:14 +00:00
Sean.Webb
35f0bc8145
ASM #18502 - Added Wind Gust entry to NationalBlend parameterInfo file
...
Change-Id: I4fca77ef9cc82923b197102f47938b7552975542
Former-commit-id: 8ba976eb2516b81da37966db2fdd7319d93ed027
2016-01-15 10:23:35 -05:00
Steve Harris
25cee1be8c
Merge branch 'omaha_16.2.1' into omaha_16.2.2
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 58b1a82b5cf59525bf266416bc8c3ca6c0dea4ad
2016-01-13 09:20:51 -06:00
Shawn.Hooper
bd27f40c6d
Merge tag 'OB_16.1.2-9' into master_16.2.1
...
16.1.2-9
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObHourReports.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewStationDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewZoneDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/DeleteStationDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/EditNewZoneDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCFloodingRainThreat.py
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFED2DDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FSSObsMonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/AreaIdXML.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/MonAreaConfigXML.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/StationIdXML.java
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/edex_static/base/viirs/viirsHeaderMapping.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: Ife2115435399146e4873a14f80e73acc15ad1b5c
Former-commit-id: 3d8811acf334fb06854bbaa71d35cff2657b3b7b
2016-01-12 15:10:02 -05:00
Shawn.Hooper
221d0396b2
ASM #18056 - Fix merge issues for serverConfig.py found in 16.2.1-5
...
Change-Id: Id36309a56d4e13093c4073256bba9aa5521e929d
Former-commit-id: ab99fdc554ed8da307b88c463fb9302476def68b
2016-01-06 13:58:41 -05:00
Steve Harris
8a07970ba6
Merge branch 'omaha_16.2.1' into omaha_16.2.2
...
Conflicts:
cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/rsc/AdvisoryResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.uf.edex.site/src/com/raytheon/uf/edex/site/SiteAwareRegistry.java
Former-commit-id: d9745246c0f81ec088b3f4108b30e02c33f6a9ae
2016-01-06 11:55:00 -06:00
Shawn.Hooper
fad499c581
Merge remote-tracking branch 'omaha/omaha_16.1.1.1' into master_16.1.2
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
Change-Id: I2e27575f864da841a07ca019a12819e0fcb16ced
Former-commit-id: 4b93303cd64cdae241f4dfc02fbdc3ab8a2c31f2
2016-01-05 20:33:34 -05:00
Joshua Watson
72214da625
VLab Issue #14152 : Add Sky, Wind for GFSLAMPGrid to GFE; fixes #14152
...
Change-Id: I680e63cc0ce883d92c22946188d9efbd9384da2b
Former-commit-id: a0ccf084b22d34c28d2abe8c9413635bb05c3a5d
2016-01-05 20:00:56 +00:00
Tom Filiaggi
22050421da
VLab Issue #14648 fixes #14648
...
Change-Id: Ic9d4ca94c9194d7cd88085a1007cdee046f5a957
Former-commit-id: a88aa984b24e3579373190fe05b11d83d2033142
2016-01-05 18:20:52 +00:00
Ana Rivera
c2f8228c2d
Merge branch 'master_16.2.1'(OB_16.2.1-4) into field_16.2.1
...
Change-Id: I617467c415770772d536ebf63fbee37d05dda274
Former-commit-id: 0404e732800c94130a76226e3b0c8947f09b6bac
2016-01-05 14:40:05 +00:00
Shawn.Hooper
f27a0b1e80
ASM #18056 - Fix merge issues for serverConfig.py in 1621-4
...
Change-Id: I22fb443dbdc32da185f1cec2ed1e427048d74e19
Former-commit-id: 497cbf7a4c272b823064edeeb55a36063ff09c6b
2016-01-04 16:54:55 -05:00
David Gillingham
7ed24b1466
Omaha #5129 : Create common IFPClient project, modify all GFE viz code to utilize it.
...
Change-Id: Idca516558b7b256197cf68b2db179bbfc74e440c
Former-commit-id: 8b9aeee624072d573c2b15d08d5e1572a51c9ed0
2015-12-09 14:50:34 -06:00
Ron Anderson
4569a74582
Omaha #5168 Fix smartInits with calcMethods using both accumulative and non-accumulative parameters
...
Change-Id: I91871ab604df0b1df6115ddedc490f6703606950
Former-commit-id: 19d92a19705f35b63c3ee56b912871e0d8ae5241
2015-12-07 15:09:54 -06:00
Ana Rivera
35d327da9a
Merge "VLab Issue #8168 - DR17495 Configure LDMSERVER values for Run NWPS script in an environment file; fixes #8168 * smartinit/nwpsCG1.py & nwpsTrkngCG0.py - eliminates multiple banners * gfesuite/nwps/bin/runManualNWPS_OutsideAWIPS.sh - install on px2f * gfesuite/nwps/etc/sitevars.ccc - install on px2f * procedures/Run_NWPS.py * gfesuite/nwps/* - chmod for directories and subdirectories * to 775. chown to awips:fxalpha" into field_16.2.1
...
Former-commit-id: 8812c10724837d76ece299c32a1ec1a0095c70a7
2015-12-04 20:40:51 +00:00
Ana Rivera
bc0a126063
VLab Issue #8168 - DR17495 Configure LDMSERVER values for Run NWPS script in an environment file; fixes #8168
...
* smartinit/nwpsCG1.py & nwpsTrkngCG0.py - eliminates multiple banners
* gfesuite/nwps/bin/runManualNWPS_OutsideAWIPS.sh - install on px2f
* gfesuite/nwps/etc/sitevars.ccc - install on px2f
* procedures/Run_NWPS.py
* gfesuite/nwps/* - chmod for directories and subdirectories
* to 775. chown to awips:fxalpha
Change-Id: I5938b66c2ae7d92642bf9e4022737569585e6bea
Former-commit-id: 4c08765fc72325e818dacc6394ee53719edac6db
2015-12-04 14:35:14 +00:00
Shawn.Hooper
6691e00db0
Merge branch 'field_16.2.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.2.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 47c4fb84dd4338fc820871adf2733a8835e981a4
2015-11-25 14:37:37 -05:00
Shawn.Hooper
3bbc0622b4
Merge branch 'tcv_16.1.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.1.2
...
Former-commit-id: b1befee21578d2ee52e4ed99335042ecfdeded75
2015-11-20 12:59:00 -05:00
Sarah Pontius
917effa917
VLab Issue #12917 - TCV and HLS Improvements; fixes #12917
...
Change-Id: I9f9c652d32176e0e12317896001eb8613ef21c57
Former-commit-id: 2f562bdb68479d53997788b9227b7f25b972231f
2015-11-19 15:36:50 -07:00
Tom Filiaggi
3cbd3714bd
VLab Issue #12487 serverConfig.py; fixes #12487
...
More responses (minor code changes) to review feedback.
Change-Id: I2ff5d25d2b13fb8f7b5e50343777b76c76b42eb5
Former-commit-id: 007439c210853856c5814b53bb17f06ba9f48bbe
2015-11-17 09:57:08 -07:00
Shawn.Hooper
fff2438f63
Merge branch 'asm_16.1.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.2
...
Former-commit-id: 0169db4f6fcbec259c8e2bc1a280ca9ae559b851
2015-11-10 16:56:56 -05:00
Shawn.Hooper
24dd68c004
Merge branch 'tcv_16.1.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.1.2
...
Former-commit-id: f68db5906f446b6a9ad485ca478da0873ce2004a
2015-11-10 16:55:54 -05:00
Ana Rivera
3a4c86515b
VLab Issue #9807 - DCS 17369 HTI:change StormSurgeWW_EditArea to shapefile; fixes #9807
...
Add map bundles: stormsurgeww.xml and nhadomain.xml
Update Maps.py, serverConfig.py and TCStormSurgeThreat.py
Remove StormSurgeWW_EditArea.xml
Change-Id: If080dc3b54bbce8e6cc33b5d9aa68d1d7473cee5
Former-commit-id: 622b9c620e073d0acd7530065f2c413cb2c0ca1d
2015-11-09 19:50:53 +00:00
Rici.Yu
da7cbd5e59
ASM #18182 - Change for accessing HPCERP ppffg grids
...
Change-Id: I98c264b964aae3c6baa31d5fbff8e8bfcb808907
Former-commit-id: 466f2812e037b1d253fc64d31de9d84b74aa6113
2015-11-05 11:08:16 -05:00
Andrew Moore
bf7cb33f6b
VLab Issue #12366 - DCS 16287. Additional validation of ISC parameters. Remerge of 10405; fixes #12366
...
Change-Id: I504af22e86c143880932ebb04d284786deb65a25
Former-commit-id: 79f0f06364127268e0625ddde79eba1a26b2bffc
2015-11-03 14:05:45 +00:00
Shawn.Hooper
491b301cc8
Merge branch 'asm_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1
...
Former-commit-id: 8d065a8bcc3e3772f46fafcf25c572acf76945f0
2015-10-28 22:38:26 -04:00
Shawn.Hooper
c22c1f271d
ASM #17446 - Update Init.py with merged fix from 15.1.2
...
Change-Id: I10ba21c54c164adc9c3fd2c5993650a4bbd09409
Former-commit-id: 328638d10764c1db49496c999ffe197b86fee43c
2015-10-27 16:39:20 -04:00
Shawn.Hooper
df241afdfe
Merge tag 'OB_16.1.1-18' into asm_16.1.1
...
16.1.1-18
Former-commit-id: 810ec254f642f9016945926c199cd3da08ea54fc
2015-10-27 16:35:25 -04:00
Shawn.Hooper
aeba8deb71
Merge branch 'asm_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1
...
Former-commit-id: b7c7cfdec3fb50edd7b9c164de6d29af465f6a8d
2015-10-26 16:14:37 -04:00
Ying-Lian.Shi
d45a7211fb
ASM #17873 renive qyites from default SVCBU_USER_ID
...
Change-Id: Ifb6894723b734b53fd4217268db50b45d5f2f427
Former-commit-id: d007b5a98a0fc4fdd6063c3c6dc5285eef661de5
2015-10-22 16:38:13 +00:00
Ron Anderson
bd1b652a81
Omaha #4967 Fix a missed __numpy__ instance
...
Change-Id: I1cffb3479c963e62d7e5e3fedac69341f1d0e718
(cherry picked from commit 2c33406500
[formerly 12e92bcf4d828cbd449f8255a29cc2da79c0c836])
Former-commit-id: f1da20c2d5f72be6106675c6c56a4279ce890816
2015-10-21 14:09:40 -04:00
David Gillingham
459011ed48
Omaha #4958 : Add support for viewing raw NationalBlend model data to GFE.
...
Change-Id: I1e8f43459cf0582fdd40aecb64ea98c9986611fb
(cherry picked from commit 75ef14640b
[formerly 1856ec86534f5ab6a3be8a0ac8bdd11da5efff20])
Former-commit-id: eba45fd796d991ecb25d86108b9e5e98a1f73cc2
2015-10-21 14:09:29 -04:00
Steve Harris
56131ac305
Merge branch 'omaha_16.1.1' into omaha_16.2.1
...
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/GageData.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: fa9ad9b8a3900bd5f94017f27bec9a5673ecb881
2015-10-21 09:22:00 -05:00
Steve Harris
d7dc889814
Merge tag 'OB_16.1.1-18' into omaha_16.1.1
...
16.1.1-18
Former-commit-id: 2c4d919b3bcbc699484f132be5984bd7d38bc58e
2015-10-21 09:15:32 -05:00
Shawn.Hooper
90badd7a3e
Merge tag 'OB_15.1.2-9' into master_16.1.1
...
15.1.2-9
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/RiverStatData.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/ContactsDataManager.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/DescriptionDataManager.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/LocationAreaManager.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: e9e9660925d0afc016f88ec73182f9eae6ab0c18
2015-10-15 17:10:19 -04:00
Ron Anderson
82e09ad9b4
Omaha #4961 Create/update procedures for using GMTED2010 terrain in GFE.
...
Change-Id: I6b51386be983546d0637d4f85ebdad87abcce3a4
Former-commit-id: 2ff9b807b8586bbb56880fe5f3f26505bbd5d87d
2015-10-14 17:30:50 -05:00
Ron Anderson
d126af0f85
Merge branch 'omaha_16.1.1' into omaha_16.2.1
...
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/FormatterlauncherAction.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowProductScriptsDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowPublishDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowSendIscGridsDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductAreaComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/FormatterUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenAction.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.plugin.loctables/src/com/raytheon/uf/edex/plugin/loctables/ingest/LocationTablesIngest.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: Ie790e3a9a0c3829655a5a798a2c8b6740d02be6c
Former-commit-id: 691ca66a6f15c3cfae1bd1c8990644951d68a46f
2015-10-14 16:31:41 -05:00
Ron Anderson
2c33406500
Omaha #4967 Fix a missed __numpy__ instance
...
Change-Id: I1cffb3479c963e62d7e5e3fedac69341f1d0e718
Former-commit-id: 12e92bcf4d828cbd449f8255a29cc2da79c0c836
2015-10-12 17:57:59 -05:00
David Gillingham
75ef14640b
Omaha #4958 : Add support for viewing raw NationalBlend model data to GFE.
...
Change-Id: I1e8f43459cf0582fdd40aecb64ea98c9986611fb
Former-commit-id: 1856ec86534f5ab6a3be8a0ac8bdd11da5efff20
2015-10-09 11:09:08 -05:00