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

7638 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fay.Liang
07c742044d Merge branch 'master_14.4.1' into asm_14.4.1 
Former-commit-id: 8f839ec64da04492e6cf109fdf47b95f08db5388
 2015-02-03 16:04:56 -05: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
Matthew Howard
a1c925be94 Merge "ASM #17055 - fix activeTableChange logging" into asm_14.4.1 
Former-commit-id: e14672d6e2b075792600c4d4d709044049e21d04
 2015-01-30 14:29:49 -05: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
Rici.Yu
969e5ca72b ASM #17055 - fix activeTableChange logging 
Change-Id: I863a43005685b5b73eb96d80f0ffa46d12ecfcbc

Former-commit-id: 777729392f9cdbbcfe3bbdd7ac4c19c714dfb31a
 2015-01-30 13:19:40 -05:00
Zhidong.Hao
caa2ebde5e ASM #647 GFE: Files not getting purged out of /awips2/GFESuite/products/ISC 
Change-Id: I64fe04fb736e9dae2158d0dc1401af5795d2ddeb

Former-commit-id: 86cf0fa14af93c1bf35f57e566e19ad45fb34b34
 2015-01-30 11:31:36 -05: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
Fay.Liang
8aa0a2a200 Merge branch 'master_14.4.1' into asm_14.4.1 
Former-commit-id: 8c72e62260026a2d1d2fb41839f1e79535b09b7f
 2015-01-28 14:31:02 -05: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
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
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
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
Daniel.Huffman
845998cbfa ASM #17057 RadarDecoder::AlertMessageSanityCheck 
Change-Id: Iedf6a1255184a3bde4b9a879a5cc4a0ecfb0ef0c

Former-commit-id: 498f55c757f20f70b11a921a2e5948c3c7c49c90
 2015-01-22 21:13:04 +00: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
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
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
Evan Polster
f361182baa VLab Issue #5963. Ensemble Tool Feature; fixes #5963 
Change-Id: I9f3c44fd80990b2ec60556d55fabade01eb4512f

Former-commit-id: 28d2f4220fa6ef06f4fd1b729607c14b5d9534ac
 2015-01-15 18:52:41 +00: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
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
Ron Anderson
ce0fa19f7b 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
690861d350 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
13fb781066 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
5b796ff2f8 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
65a0433605 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
9c57dab437 Omaha #3220 - Replaced MonitoringArea class with individual area configuration managers. 
Former-commit-id: 00fd20d76a4ea46e9806bad11b1bc5a2acc42d6e
 2015-01-12 14:32:31 -05:00
Fay.Liang
c6bd5d7675 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
3d33ce1341 Omaha #3709 reworked custom user color configuration 
Change-Id: I8b69dc378976684e989cae883e99ade9553c04d3

Former-commit-id: 18825c076fe273c9ae2e8040ccea2de0698b2877
 2015-01-12 11:06:57 -06:00
Nate Jensen
44f0f7aafc 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
Michael Gamazaychikov
bae8d9ea3f ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable. 
Change-Id: Ife5ecb2c5823d4d34c1b4af6dc53fa360074b7bb

Former-commit-id: 38eabd6196df1576970019f2b0255d3f39a825a9
 2015-01-09 15:07:29 -05:00
Juliya Dynina
0113c27937 Merge "ASM #14246 - Implemented MPE Transmit Best Estimate option" into asm_14.4.1 
Former-commit-id: d0f721f3fe93b87ca3670264a2abdf9b3b64bff8
 2015-01-08 11:49:18 -05:00
Loubna.Bousaidi
4a769ef560 ASM #14246 - Implemented MPE Transmit Best Estimate option 
Change-Id: If6dc3df81ecfee998ebcc4de8ee47ddc2466868e

Former-commit-id: 212076c520952d0327591b79449ae09ad063adf1
 2015-01-08 15:31:58 +00:00
Ying-Lian.Shi
3e1d1aa814 ASM #15035 - Add SFMG WNJ GFE Domain definition to baseline serverConfig, double quote to sigle quote 
Change-Id: I9c652fdc3440d8c15a0c443a6b80a8a10877693e

Former-commit-id: af67fa0f955b35c7b9b141fef507a5db805eaa27
 2015-01-08 15:28:54 +00:00
David Lovely
240927c241 Omaha #3957 Moved QPID to build repository directory structure. 
Change-Id: Idee474cb4dd3d9366acfad941bedcf3c999be084

Former-commit-id: f27b0c6b92b4c744493e44b510defe3d650ca1f6
 2015-01-07 12:03:10 -06:00
Slav Korolev
c215b4c91b Omaha #3937 - Removed UELE - Index out of bounds. 
Former-commit-id: 039a382cf7a891cecdc7bbb1b0b5d83e02a7df13
 2015-01-07 12:20:08 -05:00
Juliya Dynina
d0072cd181 Merge "ASM #632 -Filter erroneous RPG alert messages." into asm_14.4.1 
Former-commit-id: 503e8a59c9608c3094d817e3e2d5e07250c0e0e5
 2015-01-07 09:02:32 -05:00
Daniel.Huffman
9db291b296 ASM #632 -Filter erroneous RPG alert messages. 
Change-Id: Iacab9ba170ac0f267ac7eedeaf81113a687c988e

Former-commit-id: d7d3bc55053f16da410d3ebe1ef055e93d198790
 2015-01-07 00:41:35 +00:00