Nate Jensen
baaabc6ebb
Merge "Omaha #3954 Only draw "W" if the county is displayed." into omaha_15.1.1
...
Former-commit-id: 0bd3ff4d4bb8ca5916f10563690d250f6d8a6596
2015-02-09 15:30:19 -06:00
David Lovely
b826e56b9e
Omaha #3954 Only draw "W" if the county is displayed.
...
Change-Id: I50f0fd9992ff86908d6980ef229aa283136c212f
Former-commit-id: 02286ee728cb5641470eef898a4a6c1e4b4aa1f6
2015-02-09 13:45:35 -06:00
Ron Anderson
de2bc26628
Merge "Omaha #4072 : Remove uf.common.dataplugin.grib modules from pythonPackages project." into omaha_15.1.1
...
Former-commit-id: d8a50094bdfd977209434a8622f39d745c171f6d
2015-02-09 13:12:50 -06:00
David Gillingham
f743cba5a8
Omaha #4072 : Remove uf.common.dataplugin.grib modules from pythonPackages project.
...
Change-Id: Ibb512ca3d8c1f1ef83e51e70a70b6fba67b90922
Former-commit-id: 89a108e98c148429f574dae2abe4f5c5beacc323
2015-02-09 13:07:39 -06:00
Nate Jensen
018fbf55e4
Merge "Omaha #4028 Error occurs when closing and reopening CAVE with multiple files open in Localization" into omaha_15.1.1
...
Former-commit-id: b4721871a34c252deef29e26019103d66c6c31af
2015-02-09 09:39:39 -06:00
Mark Peters
52b1be3665
Omaha #4028 Error occurs when closing and reopening CAVE with multiple files open in Localization
...
Change-Id: Ia0d1acd9fcd3cea330167e0881b0860bd178e862
Former-commit-id: 4b828349684cf8ed6720ab555e00a33f521fd3b7
2015-02-06 15:49:35 -06:00
Nate Jensen
185724fd85
Merge "Omaha #3974 harden damage path loading/saving" into omaha_15.1.1
...
Former-commit-id: 124d16c8a641e2e0e597078d5b3b1c2d2a4a7e06
2015-02-04 16:37:42 -06:00
Nate Jensen
76a47a593a
Merge "Omaha #4009 Improved error handling for bad/incomplete DAF requests" into omaha_15.1.1
...
Former-commit-id: 468e477002a12ffe9ff20dee0c145ac323a54bc2
2015-02-04 13:42:33 -06:00
Nate Jensen
fc4e34d743
Omaha #3974 harden damage path loading/saving
...
Change-Id: I6777e3af4a48db06a484db022df9c9dffc717be3
Former-commit-id: f90afdacff032c516b1991a944104cb91d5fd719
2015-02-04 13:31:10 -06:00
Mark Peters
8600775953
Omaha #4009 Improved error handling for bad/incomplete DAF requests
...
Change-Id: I947f8097f5d8981286023ca6acbde8517581abf0
Former-commit-id: 455f7d8cd4f42e2c1611029ca6c7d5e8d1b5997b
2015-02-03 17:36:54 -06:00
Steve Harris
85457e37cb
Merge tag 'OB_14.4.1-7m' into omaha_15.1.1
...
14.4.1-7
Former-commit-id: bf0368503a8defd41a20e369e154d560b93bee6c
2015-02-03 17:30:23 -06:00
Mike Duff
e88c0745f2
Omaha #4084 - Fix for PGEN drawing bug.
...
Former-commit-id: e8c5dbc9a0012d7dd1a0f2cf0ef1c40e02245c95
2015-02-03 17:09:12 -06:00
Nate Jensen
a680e0449f
Merge "Omaha #3974 save damage path to user localization" into omaha_15.1.1
...
Former-commit-id: 0e60cb9ff1156b0f7606d7daaae6b365e8076072
2015-02-03 16:38:48 -06:00
Nate Jensen
2f7558a6c5
Omaha #3974 save damage path to user localization
...
Change-Id: I051a1ed2d15deb6a74d12d4213ddab27a607d0eb
Former-commit-id: 82f3b2bc2748cb82da598bfbbf5228a3e860f098
2015-02-03 14:15:07 -06:00
Steve Harris
8cd98ea3b9
Merge tag 'OB_14.4.1-6m' into omaha_15.1.1
...
14.4.1-6
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 9fd5ed1aea1a667552144da88dcc394a99133c52
2015-02-03 12:25:05 -06:00
Fay.Liang
ae85ade54d
Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 06a34c609a217ca98b027ac6d92a31faf802b668
2015-02-03 11:24:57 -05:00
Nate Jensen
3929b38575
Omaha #3974 attempt to fix build
...
Change-Id: I05dfa32595d1c0e5dd113a8d018d4eb58c5ea824
Former-commit-id: 6a927a53c24fe0e9672eef0fc8d1ad5e071b3468
2015-02-03 09:10:01 -06:00
Chris Cody
0619aac7fd
Omaha #4075 Export Hydro Resources package for Hazard Services
...
Change-Id: I04d312f42859a0fcc840d04d685700487204e99c
Former-commit-id: 555795af65c5f138fdf6250752861452297a7f4b
2015-02-02 14:52:48 -06:00
Nate Jensen
25cd946168
Merge "Omaha #3945 Moved the ESB folder to deploy.edex.awips2 and updated the build scripts." into omaha_15.1.1
...
Former-commit-id: 611b6980c2f69ba515b2931afca366472a909e02
2015-02-02 13:01:03 -06:00
Nate Jensen
672b872990
Omaha #3974 initial extensible drawing of polygons and preliminary
...
damage path tool
Change-Id: I0355b0a8a889bb0339412e4ad17e1b3f678d06c2
Former-commit-id: 9e748a3b6f49c17e7b9d84af1d4953b70a647b0a
2015-02-02 11:27:41 -06:00
Ana Rivera
ea92049aac
Merge branch 'master_14.4.1' into gsd_14.4.1
...
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: d5996a81aad0809aaddbb8df99a985c86c66aaf8
2015-01-30 19:29:29 +00:00
Evan Polster
0235002dc0
VLab Issue #6222 . Ensemble Tool Feature: 14.4.1 cosmetic and bug fix; fixes #6222
...
Change-Id: I0af8db16244969e80ed81b82e83544bb94188387
Former-commit-id: 24dee8480063cf90e5c261e848d9cbcddf6b9459
2015-01-29 19:14:08 +00:00
David Lovely
fa557d08e3
Omaha #3945 Moved the ESB folder to deploy.edex.awips2 and updated the build scripts.
...
Former-commit-id: b9868fc974226fe6b003b0361ce1b18507b2d810
2015-01-28 15:15:15 -06:00
Steve Harris
995d60fb54
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
8bfa7c4087
Merge branch 'master_14.4.1' into field_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I1f3f22ff1e9dfa32f971136479bb312230c1fc40
Former-commit-id: 291d66c66af4f1f4d298185412d5930714ffb2c5
2015-01-27 22:05:59 +00:00
Steve Harris
716879f58b
Merge tag 'OB_14.4.1-4m' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/roles/DataProviderEventController.java
edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/reportalarm/AlertalarmRecord.java
Former-commit-id: 714ca199f27013313099920bb9f55009c794f7f8
2015-01-27 11:56:24 -06:00
Fay.Liang
d29d86ad05
Merge branch 'emc_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 6ad30059fa7249aba100a39c7c39215212a929cc
2015-01-27 12:08:28 -05:00
Ana Rivera
7c5fc26537
Merge branch 'master_14.4.1' into field_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: Ia5c04c409d08280ae09f9999b2c6883fc0b47e18
Former-commit-id: 889608360567b829f81ed6392c64c669798f34a9
2015-01-27 16:28:42 +00:00
cmadmin
79b7be3e69
Merge "Omaha #3777 - Update numpy" into omaha_15.1.1
...
Former-commit-id: c02177fa7ab6d510e148ff58d9157f4747df38cc
2015-01-26 15:56:06 -06:00
Ana Rivera
171a38175c
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
98ac97e397
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
Shawn.Hooper
568b7c801a
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 95cdc2d817eac840017fc14746c2ada498f1a716
2015-01-26 11:22:49 -05:00
Greg Armendariz
153897c19f
Omaha #3777 - Update numpy
...
Former-commit-id: cb63272b0eab1ea78230326da1733b0d55e3da9a
2015-01-26 09:54:56 -06:00
Roger Ferrel
5e91714487
Omaha #3763 Update xml tags to match labels in the ArchiveRetentionDlg dialog.
...
Change-Id: I9d8344fdecb16d75bfa360d403ab84312f6bfe0e
Former-commit-id: 083ba10ef9ecdae0c2a242f432641b7659fdc822
2015-01-26 07:46:00 -06:00
Steve Harris
2c559f4c88
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
Steve Harris
158fa16376
Merge branch 'master_14.4.1' (OB_14.4.1-2m) into omaha_14.4.1
...
Conflicts:
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec
Former-commit-id: 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79
2015-01-23 09:08:06 -06:00
Ana Rivera
705f02f2be
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
Richard Peter
cc69519ce9
Merge "Omaha #3918 Central registry web interface broken by DPA fix." into omaha_14.4.1
...
Former-commit-id: 7591f6aa787a52c4fd2d6f9cb9917a1c62380fb5
2015-01-22 19:13:09 -06:00
Mark Peters
db69f5a0bc
Omaha #3768 Add localization to build.properties
...
Change-Id: I5f807ed34cf55868a9cf0883d9896cfaa5508b30
Former-commit-id: a6cafa7a07d33376cda3cc3a69437e45b6e0330f
2015-01-22 18:05:40 -06:00
Shawn.Hooper
314a8497f8
Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 60d478ab66ac20c8434b9eb9e4d9f029390f0ba6
2015-01-22 16:05:52 -05:00
Shawn.Hooper
0bc501bd4c
Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: d53c809149da23fcae51138cc45c57aecd641794
2015-01-22 16:05:41 -05:00
Dave Hladky
c1127b066f
Omaha #3918 Central registry web interface broken by DPA fix.
...
Former-commit-id: 5aa305adb5fd16c72ce557309cab28fd287379d9
2015-01-22 13:22:18 -06:00
Nathan Bowler
efd13e5442
Omaha #3949 Add lightning source to SCAN site run config and filter on it.
...
Change-Id: Ic8a13effa112f6858a34b07c65ddae5a592d9be5
Former-commit-id: 4817945b7eadadca996dd1e3d037a2b2de297ec4
2015-01-22 12:15:00 -05:00
Ana Rivera
7b47ffe362
VLab Issue #6082 - Patch for BinLightningDecoder.java; fixes #6082
...
Change-Id: Ide610d8209a7072dbcdc4bb7c26fc85cedc6e24f
Former-commit-id: 8a66266d3ffa236343f14089d7e7b32c1060f9ea
2015-01-22 16:11:44 +00:00
Greg Armendariz
be4f0a90a1
Merge "Omaha #4014 : Add pattern for ETSS to pqact.conf." into omaha_15.1.1
...
Former-commit-id: 7523ff1690d7ae213dbae37bf79540b747776eea
2015-01-22 09:47:35 -06:00
David Gillingham
00be4da9e4
Omaha #4014 : Add pattern for ETSS to pqact.conf.
...
Change-Id: I016cc2c4cfdae309a8129876c519ca7919eafe5e
Former-commit-id: d9ed1da11db7de1d662e0ed2b700ba4a2d8e868d
2015-01-21 10:29:30 -06:00
Ron Anderson
6b8705ee39
Omaha #4013 Change rsyncGrdsToCWF_client.sh to use any available EDEX cluster member
...
Change-Id: If2370cf73ec816bbac2a9b46ebbc8fb720eae805
Former-commit-id: e2f809e7b48f83b5abeb4dcda0c7e96a160e7fbf
2015-01-20 16:46:47 -06:00
Ron Anderson
1defc08434
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
David Gillingham
41af2f661c
Omaha #4014 : Add ingest and display support for ETSS model.
...
Change-Id: I5bff5985d779a9d665cbe5a005171b2076212846
Former-commit-id: fa7e11a22b47a48d2bc7b9cf6f0ddfd97ea2fea7
2015-01-20 14:02:06 -06:00
Ron Anderson
03df152b3d
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
