Fay.Liang
8cce7a082c
Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into int_15.1.1
...
Former-commit-id: fb0b41ff7b119e80d81e028bd8a768d6df335cf3
2015-05-13 15:11:13 -04:00
Shawn.Hooper
003c528458
ASM #17024 - Merge up to 14.4.1-38 into 15.1.1-10
...
Change-Id: Id4091550082328ce8a682db5ddd1a133fb7a5d39
Former-commit-id: 721a43ed8a1c9fdd1e5c62827869a91a20bfb416
2015-05-12 11:30:23 -04:00
Fay.Liang
af1448c5d0
Merge branch 'emc_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 3fa21300bc62a687cd076b709e4df8f8bf508edc
2015-05-10 00:16:32 -04:00
Ana Rivera
565fbb949c
VLab Issue #8081 - Baseline NWPS Weather Element groups; fixes #8081
...
Change-Id: I901d43e6474cb659407b6bcf1e1798c7de2dc341
Former-commit-id: 5e749f9f2b1bddbb57d1e61d0211982db90656cd
2015-05-08 14:42:40 +00:00
Ron Anderson
c8be7b62d7
Omaha #4467 Add support for mixedCase to runIFPText.
...
Change-Id: I69c063596d175ea89a2b4537722bdb1ff399cb55
Former-commit-id: 3cc39323a55aaec6b38356724d2949605d4fde37
2015-05-06 13:17:08 -05:00
Shawn.Hooper
48e06c41ad
ASM #17024 - Merge tag 'OB_14.4.1-33' into MERGE-14.4.1-33
...
Merge 14.4.1-33 into 15.1.1-8
Change-Id: Iaebe94615f952be4b294aea0bcba04117b903e9c
Former-commit-id: 1f63e395c67afa5106bde7b96b72d4b3111221d3
2015-05-01 16:12:48 -04:00
Ron Anderson
551d1bee91
Omaha #4027 More changes for Mixed Case
...
Change-Id: Id47f1c68877e8df0cbf84df09bdaa000a41a863e
Former-commit-id: 0e48bfe4de5c227ebf96b0b59f9c7a9c39415f2e
2015-04-29 13:18:27 -05:00
Ron Anderson
0edd237aa7
Omaha #4027 More GFE changes for Mixed Case WA
...
Change-Id: Ia1b65979d442246984b1e281c902c9f078fa4848
Former-commit-id: 0eef8697e269644ec36c1c7f7b09610778beb4a1
2015-04-20 17:17:08 -05:00
Fay.Liang
6dd4acc2c2
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 03e663afae6eb0998892e2921566652f42196e1f
2015-04-16 23:06:25 -04:00
Rici.Yu
03034f57c8
ASM #14946 - fix issue when timezone is not defined for any zone in a segment
...
Change-Id: I252f78cb9f5bf1cf556788c79fe14ad338b546aa
Former-commit-id: ef4c5307d5693abd834f4210e081fb8e3a21f90b
2015-04-16 13:24:29 -04:00
Rici.Yu
c9337caeb2
ASM #17390 - Fix string/int conversion issue preventing BOIVerify from launching
...
Change-Id: I6c0a0ea22650a5b42b24b41e41e3ca0acabbf14b
Former-commit-id: c6888b4aa86ed3425b5a016d2fbe5664763b4682
2015-04-16 10:51:23 -04:00
Fay.Liang
6cd66bff93
Merge tag 'OB_14.4.1-25' into master_15.1.1
...
This merge includes all changes in 14.4.1-22, -23, -24, and -25
Conflicts:
cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/FileTreeView.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.common.dataplugin.text/utility/common_static/base/mixedCase/mixedCaseProductIds.txt
Former-commit-id: 857d0d89ae214ccf53713f74ef6778ba80c637fe
2015-04-13 13:02:24 -04:00
Fay.Liang
618781f10c
Merge tag 'OB_14.3.3-2' into master_14.4.1
...
14.3.3-2
Conflicts:
cave/com.raytheon.uf.viz.spellchecker/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java
Former-commit-id: f5fad51061f568aea4ea581a099ef8353758add6
2015-04-06 15:40:31 -04:00
Ron Anderson
4132bbf6cf
Merge "Omaha #4027 Convert all GFE text products to mixed case" into omaha_15.1.1
...
Former-commit-id: 67762d2b731cba6e8846ff04609454b354fa89a6
2015-04-02 17:05:47 -05:00
Rici.Yu
0492e66d87
ASM #17194 - convert SerpConfig.py from smart tool to utility
...
Change-Id: I8007ca1676de148aa42c5b15c8e3366bbe8c8e5d
Former-commit-id: 6968986c535bbadee8436cca5cfcc329d47c606b
2015-04-02 10:48:25 -04:00
Steve Harris
7375074ed8
Merge tag 'OB_15.1.1-2m' into omaha_15.1.1
...
15.1.1-2m
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 7cad81591e22bc1a46f54982f0cd0ca647208290
2015-03-30 11:07:52 -05:00
Ron Anderson
ea0b02bedd
Omaha #4027 Convert all GFE text products to mixed case
...
Change-Id: I94275b65e8733d5bed1242f78503f1613b2e0aff
Former-commit-id: 07088e71d78d6302da23683894d96d72e4f69a96
2015-03-26 18:30:39 -05:00
Fay.Liang
86a8041062
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/build.edex/edex/common.properties
Former-commit-id: ba576b948587ea7b1c077ebad7113bc4e7504c00
2015-03-19 12:35:31 -04:00
Steve Harris
67b3a77c4f
Merge tag 'OB_14.4.1-18m' into omaha_15.1.1
...
14.4.1_18m
Conflicts:
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 41217304fa68101d17e003b2fa6992d0e15b083c
2015-03-18 09:29:01 -05:00
Ron Anderson
7bbd4b6a25
Omaha #3955 Additional updates to try to make the procedures more bulletproof.
...
Change-Id: Ie4c9d02c880dd460ef3470db9c68f5a67c0e924c
Former-commit-id: 1ff0a8ab8715a780fdc14db7f81f1708567fdc78
2015-03-12 16:23:37 -05:00
Ron Anderson
370d0a0f70
Omaha #3955 Fix regression that brok ViewWCL
...
Change-Id: Ib1ff4137004cff22ef94e8029bbc62875992252e
Former-commit-id: 6af18dc2a364507481a119661f940aa420e379a9
2015-03-12 12:58:00 -05:00
Fay.Liang
0e475cb704
Merge tag 'OB_14.3.2-19m' into master_14.4.1
...
14.3.2-19m
Conflicts:
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
cave/com.raytheon.viz.product.awips/awips.product
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF
ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 4b3626307cf35ada45985c25cf062e7b857db764
2015-03-09 16:11:13 -04:00
Shawn.Hooper
54d5553a93
ASM #17178 - Update TCMWindTool to remove option for background Wind field
...
Change-Id: Ia299900784b9fe05a68ca25a74528abdc68a3f1f
Former-commit-id: bc4ec070e81298f7ed7312692a7f43cbd2d854ec
2015-03-05 12:58:44 -05:00
Fay.Liang
1ed5d493fa
Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: c91a37257cd2882047e79200f624acc1e0312cba
2015-03-03 14:44:31 -05:00
Fay.Liang
9a4751b60e
Merge branch 'master_14.3.1.1' into master_14.3.2
...
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 5aa2c444583d03b442768a8e9ea462877a25bb8d
2015-03-03 14:26:22 -05:00
Ana Rivera
5c19f14f0e
Merge "VLab Issue #6517 - TCMWindTool Fix; fixes #6517 " into tcv_14.3.2
...
Former-commit-id: 7746c8ce24f444d0d9b480e756d092b482e7428a
2015-03-02 22:19:14 +00:00
Bruce.Hundermark
fe162829de
ASM #13961 - GFE: ISC_Discrepancies tool creates unnecessary alarms
...
Change-Id: I7d4aec9d82a6f792bdf2a20d2b3fd271829d1edb
Former-commit-id: 19bd1d7d169521f322fbfb828ee27327515e0152
2015-03-02 18:22:55 +00:00
Sarah Pontius
054762876e
VLab Issue #6517 - TCMWindTool Fix; fixes #6517
...
Change-Id: I986c425ecc57ab919f2b43ec6b1c4438e789cd86
Former-commit-id: 427c442c31ba87f6c20bdfe17abedceb90fb2e7a
2015-02-25 13:51:44 -07:00
Ron Anderson
ebb221d935
Issue #4099 Fix ETNs for products that span year-end.
...
(cherry picked from commit c7a8c9b049ae8d73ffb61765f31374e01d1d2a33)
Former-commit-id: 7ca4dd9ba059035e366807d4928768121fdd0712
2015-02-24 12:09:29 -06:00
Ana Rivera
d828b762ec
VLab Issue #6566 - HTI: Update six scripts and one image; fixes #6566
...
Change-Id: I49052579740e22c54c0307d3787d9656bdf30bb5
Former-commit-id: 2f9dd9b8422b899146f73da0a3d922b32b021152
2015-02-23 17:28:29 +00:00
Fay.Liang
e0917a9f3f
Merge branch 'asm_14.3.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.2
...
Former-commit-id: 10cc507489cc2ac649242ddfbe9791aee59c8890
2015-02-19 16:40:21 -05:00
Rici.Yu
cc44f78fcf
ASM #17120 - retrieve practice products in non-operational mode
...
Change-Id: I2b76edaface7d185269e6e5ea5f032eeb3d4dab0
Former-commit-id: 16dccf94319fbb3a617cc5e2360d0b0aa1c9cc9c
2015-02-19 10:48:19 -05:00
Sarah Pontius
e4a1aa13f5
VLab Issue #6386 - HLS/TCV Beta Testing Changes; fixes #6386
...
Change-Id: Ica6e803b85c34e6d65fd268b844eaac06417909e
Former-commit-id: 5fbb83dd042795e308ca8b6aa370e4f9b0fb3291
2015-02-13 10:12:53 -07:00
Steve Harris
118f52263f
Merge branch 'omaha_14.4.1' into omaha_15.1.1
...
Former-commit-id: ffee274d844442a36d633deda5776c09a758cb38
2015-02-12 12:48:29 -06:00
Fay.Liang
43c7161dcf
Merge branch 'master_14.3.2' into master_14.4.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
rpms/awips2.core/Installer.java/1.7/component.spec
Former-commit-id: e91a78eec910b84f44350d3aae68a26f4e0dcd72
2015-02-09 17:19:41 -05:00
Rici.Yu
1188dab0f4
ASM #17039 - Remove HighlightFramingCodes feature
...
Change-Id: I7ee07ef64b1a16cdeb0b6af48ccaf3c228357891
Former-commit-id: cb047745b4a5c523bd1ca26692c758d3e72d8ddc
2015-02-04 10:23:30 -05:00
Steve Harris
47234a3757
Merge tag 'OB_14.4.1-5m' into omaha_15.1.1
...
14.4.1-5
Conflicts:
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
Former-commit-id: 28075dabb4b6421ddaee3af71518f565d9bc7e90
2015-01-28 13:45:36 -06:00
Ana Rivera
dee10b3f6f
Merge branch 'emc_14.4.1' of gerrit:AWIPS2_Dev_Baseline into emc_14.4.1
...
Former-commit-id: 6c72e1864ad5843c4ac42a558b589777af047c77
2015-01-26 19:04:54 +00:00
Ana Rivera
7c25945fd9
Merge branch 'master_14.4.1' into emc_14.4.1
...
Conflicts:
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
Change-Id: I3a9565d5861f431bd8ac74f8e20e5e79bbbdbad1
Former-commit-id: 51ef304bd94fd003a1e7349a22c41e21b340ac8a
2015-01-26 18:45:26 +00:00
Steve Harris
9234ceb485
Merge tag 'OB_14.4.1-2m' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py (self-resolved)
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml (took both Anna and David's additions)
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py (took both Anna and David's additions)
Former-commit-id: 01c4aa19ab0b21f331c2200076efbd44eb3b2af6
2015-01-23 09:32:44 -06:00
Ana Rivera
44fa40c0cc
VLab Issue #5945 - Update NWPS: Run_NWPS.py; fixes #5945
...
Change-Id: Ib0d4356bd5d2c99f33204bf88bf65fe9a7db3278
Former-commit-id: 653472d785f4af6fef8f2edd93c2e538806096ab
2015-01-23 14:21:22 +00:00
Ron Anderson
29a0caeae3
Omaha #4012 Create GFE procedure to mark grids updated without change for ISC
...
Change-Id: Iaf9be8083e1c15f0d39734691f88f39f1a897b93
Former-commit-id: f50c6f3f4510cfcb08ee5f023090c0c5d02b1880
2015-01-20 16:36:19 -06:00
Ron Anderson
b7b7670bd9
Merge "Omaha #3955 Changes to support editing GFE topo and comparing with new Standard Terrain data" into omaha_15.1.1
...
Former-commit-id: 27d20161a120d027cc0d2ed892384cdc00faeba5
2015-01-19 15:08:31 -06:00
Ron Anderson
305d1901fd
Merge "Omaha #3955 Move GridType enum into GridParmInfo where it belongs" into omaha_15.1.1
...
Former-commit-id: e541806ce417494bb65248a5d09f8fa5585bedd9
2015-01-19 15:08:08 -06:00
Ron Anderson
ea2dbf54ff
Omaha #3955 Changes to support editing GFE topo and comparing with new Standard Terrain data
...
Change-Id: Ic12b1e257b7997fc2fbc5efd7a8833ac26366135
Former-commit-id: 653d8ec5a7adfc2ebb87ec6cbde2715f9c8fcfe9
2015-01-19 14:02:42 -06:00
Ron Anderson
a955bd6e36
Omaha #3955 Move GridType enum into GridParmInfo where it belongs
...
Change-Id: Ia9265527302d8ff9213e8f55f63e5b6b91bdcd98
Former-commit-id: 9bad7ebc912f6dbf9642f250494a992bc522252c
2015-01-16 12:33:52 -06:00
Nate Jensen
b40ad431a1
Omaha #4006 ensure mask has dtype bool for more strict numpy checks
...
Former-commit-id: e7b7ac26920072b293a9a781af7fdf681b4a56d8
2015-01-16 09:44:05 -06:00
Fay.Liang
eed6737801
ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
...
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
rpms/awips2.core/Installer.postgres/component.spec
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.tools/component.spec
rpms/python.site-packages/Installer.h5py/component.spec
rpms/python.site-packages/Installer.matplotlib/component.spec
rpms/python.site-packages/Installer.nose/component.spec
rpms/python.site-packages/Installer.pupynere/component.spec
rpms/python.site-packages/Installer.qpid/component.spec
rpms/python.site-packages/Installer.scientific/component.spec
rpms/python.site-packages/Installer.scipy/component.spec
rpms/python.site-packages/Installer.shapely/component.spec
rpms/python.site-packages/Installer.tables/component.spec
Former-commit-id: 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd
2015-01-12 13:03:31 -05:00
Sarah Pontius
1159e8487c
VLab Issue #5879 - HLS/TCV Post-SwIT Changes; fixes #5879
...
Change-Id: I248822f54d31eb5e0a7312171acf1d59dde7c73d
Former-commit-id: 9cf4ca3c746accf745172bd7dc85e851da95ab6f
2015-01-09 15:13:45 -07:00
Rici.Yu
5b5d6fd5cd
ASM #14946 - GFE: ZFP displaying time for office timezone for zones in different timezone
...
Change-Id: I082b26ffea4b228baf4f40afb019994d5fe1e7dd
Former-commit-id: 18ab87670fbdd007e5027553d4ee58262ae54f22
2014-12-16 15:34:35 -05:00
