Fay.Liang
53bdc83ba4
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: dd741e026ef0599738bbbc82579a679b57feeef7
2015-03-19 17:18:52 -04:00
David Gillingham
a4d13dbabd
Omaha #4103 : Update GFE service backup server code to support multiple service backup sites, use "smarter" lock files to store additional status.
...
NOTE: Service Backup features are broken until DR 4300 lands on this branch.
Change-Id: Ic0184c10c553187c8d0515f639c5a33fd3abde1f
Former-commit-id: 732208b6600882a9ba9fcc0eefd7c8be0157beab
2015-03-19 16:13:56 -05:00
Paul Grell
f47e4fdcff
Merge "Revert "Revert "ASM #17217 - GFE: default to smart formatter types""" into asm_14.4.1
...
Former-commit-id: 60344f611d90d46fffcf2a05230670b72f303916
2015-03-19 16:05:49 -05:00
Paul Grell
3b71d36945
Revert "Revert "ASM #17217 - GFE: default to smart formatter types""
...
This reverts commit b1d84d2964
2015-03-19 16:02:22 -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
c585001981
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Former-commit-id: 3e863af798cf64ae9bbde71649339aa99698e33b
2015-03-18 16:05:13 -05:00
Fay.Liang
475019fb61
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: e926e1c0160e7d40df41fbe1e6ec7dd7263ade3e
2015-03-18 15:12:56 -04:00
Paul Grell
4b1cec4b99
Merge "Revert "ASM #17217 - GFE: default to smart formatter types"" into asm_14.4.1
...
Former-commit-id: 4601ad77a9e49efaf34d4563baddcdf61dbd5804
2015-03-18 10:44:10 -05:00
Paul Grell
b1d84d2964
Revert "ASM #17217 - GFE: default to smart formatter types"
...
This reverts commit 70e5e24941
2015-03-18 09:36:12 -05:00
Rici.Yu
6a7fbec942
ASM #17217 - Add fullStationID entry for table products
...
Change-Id: I6f68b499ce67a2c6b6bb9dad833b76e3c37d6847
Former-commit-id: a987fe4493e4e58618271fffb37a708185ed4139
2015-03-18 10:30:38 -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
Steve Harris
169b925507
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Former-commit-id: 04fa26ff310af7fd9574eeae98900d83e18ba276
2015-03-18 08:50:05 -05:00
Rici.Yu
70e5e24941
ASM #17217 - GFE: default to smart formatter types
...
Change-Id: Ib831998a7293e61a5b606d03ef19f47b09f2e0d5
Former-commit-id: 81aea3167f21670d7b41eec5458a1f7d36edb36a
2015-03-17 11:26:37 -04:00
Ron Anderson
6731ad4200
Omaha #4246 Changes to support VCModules at base, site, and user levels
...
Change-Id: I995ad5c185ec8c5f0056f28f7e2e1c5b5d7395fc
Former-commit-id: 33c2ab1111deb0ede6a3196d889475bc69dd63d4
2015-03-12 18:09:58 -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
Steve Harris
fdac40e9b1
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Former-commit-id: 28ce8ff8e28e73375a942d0d15700f1cbb06ec24
2015-03-09 21:41:36 -05:00
Steve Harris
85b687be0b
Merge tag 'OB_14.4.1-16m' into omaha_15.1.1
...
14.4.1-16m
Former-commit-id: 468600e9d5144873e5af1529ae0d38673e81bb17
2015-03-09 18:54:39 -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
David Gillingham
4499b0323a
Omaha #4203 : Make list of groups scrollable on save/delete weather element group dialog.
...
Change-Id: Iec5f5eae8fb862e92ea8db57fe8a0d54f9e0e72d
Former-commit-id: 38076c0efc699144d6f7815b23323c737289bfc9
2015-03-03 11:04:00 -06: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
Ron Anderson
ce87addfe4
Omaha #4126 Ensure transmit is properly cancelled if dialog is closed
...
Change-Id: I259089abc4f4c9ce5cdfb80892273f7c0dd1ec65
Former-commit-id: 781b6d4f32ec8e9d34d746db72aebab4d4153c56
2015-02-27 12:29:22 -06: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
David Gillingham
450f664de6
Omaha #4051 : Allow temporal editor to edit grids when there is no active edit area.
...
Change-Id: Ic90e8250942d9d82f9e8b0843dda444927730242
Former-commit-id: 134299f00d86284363174f06f478d95c67809202
2015-02-20 11:40:00 -06: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
Steve Harris
9311e6f440
Merge tag 'OB_14.4.1-10m' into omaha_14.4.1
...
14.4.1-10
Former-commit-id: 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2
2015-02-11 15:53:38 -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
Nate Jensen
ea273e14bf
Omaha #4089 harden safety of numpy dtypes in gfe arrays
...
Change-Id: Ic77b459bc4d68930418ad66680ee86069c540c1f
Former-commit-id: ed77ff564520c8f6ad157dd115d37d69cbfab660
2015-02-05 18:03:47 -06:00
Rici.Yu
1188dab0f4
ASM #17039 - Remove HighlightFramingCodes feature
...
Change-Id: I7ee07ef64b1a16cdeb0b6af48ccaf3c228357891
Former-commit-id: cb047745b4a5c523bd1ca26692c758d3e72d8ddc
2015-02-04 10:23:30 -05:00
Ron Anderson
933590f36a
Merge "Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up." into omaha_14.4.1
...
Former-commit-id: 170e3149e6cf9feb7a8ab0e2ac3ed0826b9f7b6c
2015-02-02 15:04:51 -06:00
Ron Anderson
346ea417ea
Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up.
...
Change-Id: Ifa188f6e465062b1cf16042c87bf1074814909a2
Former-commit-id: 9d2f64b08acbec0567c7f29871480827ff0f6de7
2015-02-02 11:26:59 -06: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
Steve Harris
bc3f196d48
Merge tag 'OB_14.4.1-5m' into omaha_14.4.1
...
14.4.1-5
Former-commit-id: 6f10c0ebeb8956fd0d12f424ddd9b09bdc4b4021
2015-01-28 12:57:55 -06:00
Ron Anderson
8a86832fb2
Omaha #4018 Formatted all formatter launcher code to make later code reviews easier
...
Change-Id: Iaf415b8bdd3e8fdc46b8ea66e066b9c2ce3b6f7a
Former-commit-id: 99ae51d268e784461c0686a9d86d512049a501ac
2015-01-27 13:43:44 -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
