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
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
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
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
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
Ron Anderson
b58904fe25
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
596149053f
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
Lee Venable
4721c5455f
Merge "Omaha #4001 : Ensure WarnGen sends properly populated SendPracticeProductRequest objects when transmitting in practice mode, create delta script for hazard services db changes." into omaha_15.1.1
...
Former-commit-id: cd1c9f622d49d3ff5a0975cd53600de46a5172a0
2015-01-19 11:10:08 -06:00
Ron Anderson
5dfd9d6f8c
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
Ron Anderson
19615b59aa
Merge "Omaha #4006 ensure mask has dtype bool for more strict numpy checks" into omaha_15.1.1
...
Former-commit-id: f2201adc32424ed345ab3dffda1f238c47b6c5cd
2015-01-16 11:06:28 -06:00
Ron Anderson
899235138c
Merge "Omaha #3996 NullPointerException Occurs when Drawing and Issuing Hazards" into omaha_15.1.1
...
Former-commit-id: c6cacfdda1724ff43da04221f5fc2fbb0d9e3ae2
2015-01-16 11:03:14 -06:00
Nate Jensen
77f6df5d34
Omaha #4006 ensure mask has dtype bool for more strict numpy checks
...
Former-commit-id: e7b7ac26920072b293a9a781af7fdf681b4a56d8
2015-01-16 09:44:05 -06:00
Mark Peters
96da1cafbe
Omaha #3947 CAVE time in practice mode does not default to real time
...
Change-Id: If53a9348e75abf69f3395629685f8a26973f9e52
Former-commit-id: 25f9ab8850c1f27f7b896a711fc3c1220ad8a4cd
2015-01-15 18:06:37 -06:00
David Gillingham
7b373c4ae4
Omaha #4001 : Ensure WarnGen sends properly populated SendPracticeProductRequest objects when transmitting in practice mode, create delta script for hazard services db changes.
...
Change-Id: I1debd8c239362a25cde641207ec57d7fc4c9cfd7
Former-commit-id: f1984e0a25c68fc21c1a9af833d1de2634bb489d
2015-01-15 14:42:35 -06:00
Richard Peter
a754644505
Merge "Omaha #3789 removed unnecessary arguments to uengine jetty endpoint" into omaha_15.1.1
...
Former-commit-id: 7f514d51ea7858681fa22e923677e6f4e9d51631
2015-01-15 13:43:12 -06:00
Nate Jensen
16d862700a
Merge "Omaha #3993 ensure important dataplugin utility folders are included in viz builds" into omaha_14.4.1
...
Former-commit-id: 6557237cd4cea3300292e1612622547c23bdde2c
2015-01-15 13:07:10 -06:00
Brian Clements
44acb69ede
Omaha #3789 removed unnecessary arguments to uengine jetty endpoint
...
Change-Id: I9442351c05ecf4a67ea05b536ef94bbd26c214f3
Former-commit-id: 9f1eee3bcf4eb5e72c433055d2f2b5727056ee39
2015-01-15 09:28:26 -06:00
David Lovely
1cfc27241f
Omaha #3957 Removed trailing slash in Spec for QPID.
...
Change-Id: Ief731b9e13701c19cd11bc383b1336e53d6174f5
Former-commit-id: 5fe598aef48f91e57d8f233872ccd0bab395164e
2015-01-15 08:16:18 -06:00
Chris Cody
8b70f9f919
Omaha #3996 NullPointerException Occurs when Drawing and Issuing Hazards
...
Change-Id: I2ccc6596bbff035a4904a1fa6b0fe45c3416c85e
Former-commit-id: 0b64b70ab9c1f518062fd8f0c78ac51abea6e11b
2015-01-14 15:48:13 -06:00
David Lovely
63c3631559
Omaha #3957 Fixed path in Installer.edex-environment for QPID.
...
Change-Id: I846d0793c646a2e6321ed74ab672f70407ff13ac
Former-commit-id: 8107830bf2fa384c3bbe9472801c89a2a43990a3
2015-01-14 14:40:36 -06:00
Nate Jensen
bdb58ec755
Merge "Omaha #3709 unify collaboration color management" into omaha_14.4.1
...
Former-commit-id: fa93fe561ae1ad49979ab657b4a537dc7731af8e
2015-01-14 14:05:18 -06:00
Brian Clements
1c2d8e01d0
Omaha #3709 unify collaboration color management
...
group chat session colors controlled by session color manager
color config persistence moved to utility
shared display uses same action to change colors as other sessions
Change-Id: I8ba4a3fb4842e3f96f05ee6d16b7e81e9567f6d7
Former-commit-id: c0cd560fb1b6e8c04047c0d7b7d407e9072f0cec
2015-01-14 13:00:25 -06:00
Greg Armendariz
6c7e615de5
Merge "Omaha #3957 Fixed path in Installer.edex-environment for QPID." into omaha_14.4.1
...
Former-commit-id: 7c37c3ef1e9822a988f2f3aff9e884fbe48dce9c
2015-01-14 11:33:29 -06:00
David Lovely
9b9d569062
Omaha #3957 Fixed path in Installer.edex-environment for QPID.
...
Change-Id: I22eea04180974e6d3cbcfb4fc4a2e18fe7823db9
Former-commit-id: 34faf643b5de3c01713e0129209efb4ccc2c2aa0
2015-01-14 11:28:56 -06:00
Ben Steffensmeier
22f13c9f08
Omaha #3966 Limit the number of flags on wind barbs.
...
Former-commit-id: 8b0ce01043b4ba2858dacb5ceeb41299f5c2044d
2015-01-13 17:21:43 -06:00
Nate Jensen
05307be9d0
Omaha #3993 ensure important dataplugin utility folders are included in
...
viz builds
Change-Id: I3bb2a464f482995943e3729e439c3f0c8fbfe747
Former-commit-id: 9f30c7195d6a62206bae05d6e17df4a8e068255e
2015-01-13 16:47:04 -06:00
