xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7613 commits 31 branches 40 tags 3.8 GiB
Commit graph

7613 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steve Harris
8eb10d0456 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
cmadmin
12eeac74ce Merge "Omaha #3777 - Update numpy" into omaha_15.1.1 
Former-commit-id: c02177fa7ab6d510e148ff58d9157f4747df38cc
 2015-01-26 15:56:06 -06:00
Shawn.Hooper
e84a037b2e 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
0ebaf6c5eb Omaha #3777 - Update numpy 
Former-commit-id: cb63272b0eab1ea78230326da1733b0d55e3da9a
 2015-01-26 09:54:56 -06:00
Roger Ferrel
d1941fd84e 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
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
Steve Harris
0f05c53a53 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
Richard Peter
d7f79b859b 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
7a69f354d9 Omaha #3768 Add localization to build.properties 
Change-Id: I5f807ed34cf55868a9cf0883d9896cfaa5508b30

Former-commit-id: a6cafa7a07d33376cda3cc3a69437e45b6e0330f
 2015-01-22 18:05:40 -06:00
Shawn.Hooper
37c89530a6 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
a757b55446 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
a15e67385a Omaha #3918 Central registry web interface broken by DPA fix. 
Former-commit-id: 5aa305adb5fd16c72ce557309cab28fd287379d9
 2015-01-22 13:22:18 -06:00
Nathan Bowler
4dd5b6999c 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
504fe69507 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
86465c82dd 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
f7b327f1f6 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
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
David Gillingham
4604975854 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
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
Lee Venable
f0e2d15190 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
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
Ron Anderson
939ba09a9d 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
59b82d777c 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
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
Mark Peters
4d01175dfa 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
c5961ac23e 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
a889ad4845 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
865852c20c 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
b46ebe7743 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
cf4077e8cd 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
14f12323d3 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
0b7ee2dc08 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
7c61d2c06d 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
8cc1aa9f33 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
0431783330 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
f75230366c 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
3a6bce1100 Omaha #3966 Limit the number of flags on wind barbs. 
Former-commit-id: 8b0ce01043b4ba2858dacb5ceeb41299f5c2044d
 2015-01-13 17:21:43 -06:00
Nate Jensen
b434ae1343 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
Ron Anderson
b8fdaf17a4 Omaha #3997 Create script for sites to use to compare AreaDictionary.py files 
Change-Id: I0b76c40ffe70d1df9d9379deca4bdc0276a723fd

Former-commit-id: 23b10f94f9ff892fdbff654e6fefbd4b3c914f58
 2015-01-13 15:11:42 -06:00
Ron Anderson
82aa416c48 Omaha #3997 Create delta script to preserve the site's current AreaDictionary.py file 
Change-Id: Id38826c171ed6d87fd8b677c53df7e2a6b49254c

Former-commit-id: 9da286a579c582db47d63aba83552f5361d819e0
 2015-01-13 14:32:50 -06:00
Fay.Liang
a09a27a963 ASM #15311 - Merge changes from asm_14.4.1 into master_14.4.1 
Merge branch 'asm_14.4.1' into master_14.4.1

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java

Former-commit-id: 67315d8c5f28f5ed5e0870f65de30a9c2c2bd290
 2015-01-13 14:35:30 -05:00
cmadmin
478e3825ae Merge "Omaha #3957 Moved QPID to build repository directory structure." into omaha_14.4.1 
Former-commit-id: 455b763fd46e6053e272854e89074cdb898d4a6c
 2015-01-13 09:14:43 -06:00
Nate Jensen
511ba87c5c Merge "Omaha #3709 reworked custom user color configuration" into omaha_14.4.1 
Former-commit-id: d7cc45aa26f71ad81d82dc1dfa2541e105b4c76c
 2015-01-12 13:59:25 -06:00
Slav Korolev
b8ab18d3e1 Omaha #3220 - Replaced MonitoringArea class with individual area configuration managers. 
Former-commit-id: 00fd20d76a4ea46e9806bad11b1bc5a2acc42d6e
 2015-01-12 14:32:31 -05: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
Brian Clements
46c0d7d42c Omaha #3709 reworked custom user color configuration 
Change-Id: I8b69dc378976684e989cae883e99ade9553c04d3

Former-commit-id: 18825c076fe273c9ae2e8040ccea2de0698b2877
 2015-01-12 11:06:57 -06:00
Nathan Bowler
c562618d28 Omaha #3897 Better handle invalid Section 2 data. 
Change-Id: I50ce32553027d90e677f001efd6bc27fd6e9a091

Former-commit-id: c5ff89d216e9df47330efb6560d47406ac3601fe
 2015-01-12 11:27:55 -05:00
Nate Jensen
06054344dd Merge "Omaha #3918 Fix for standalone clients not starting due to central registry non-existance. Change-Id: I78ed5dd75e94d567d934acfae098d59364a62292" into omaha_14.4.1 
Former-commit-id: 5fc926b7e735f2c92b16a85a7ba5f663a443ea53
 2015-01-12 09:22:30 -06:00