Fay.Liang
ce13acde08
Merge branch 'master_14.4.1' into asm_14.4.1
...
Former-commit-id: 4c69a4bc248aa0a2a2004c69a4bc248aa0a2a200e8b40ad087e8b40ad08718dc24db2ac211279c0a0c10a2fd3a
2015-01-28 14:31:02 -05:00
Fay.Liang
5ef24fe432
Merge branch 'emc_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 65d91d9113d29d86ad0565d91d9113d29d86ad057bc10075e57bc10075e586a40666bd5e75c0c5aaf0713c1934
2015-01-27 12:08:28 -05:00
Ana Rivera
be37ebdc3e
Merge branch 'emc_14.4.1' of gerrit:AWIPS2_Dev_Baseline into emc_14.4.1
...
Former-commit-id: f565ef4315171a38175cf565ef4315171a38175cdee10b3f6fdee10b3f6f0b7f2e3dd77f3230cab24b2580bacc
2015-01-26 19:04:54 +00:00
Ana Rivera
aa04bff454
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: 654d08a58898ac97e397654d08a58898ac97e3977c25945fd97c25945fd9d6630d8f35eae1bd317dcd2841195b
2015-01-26 18:45:26 +00:00
Shawn.Hooper
a5b70920fd
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: e6c4f29036568b7c801ae6c4f29036568b7c801ae84a037b2ee84a037b2e9cc09ab18e735893aab0bbaebe4fc0
2015-01-26 11:22:49 -05:00
Steve Harris
fcdd2faaf1
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: 8cd9e2e92f158fa163768cd9e2e92f158fa163760f05c53a530f05c53a535fda208a17033d0fc742c3d3d5f424
2015-01-23 09:08:06 -06:00
Ana Rivera
c3ce42f75b
VLab Issue #5945 - Update NWPS: Run_NWPS.py; fixes #5945
...
Change-Id: Ib0d4356bd5d2c99f33204bf88bf65fe9a7db3278
Former-commit-id: de1b989253705f02f2bede1b989253705f02f2be44fa40c0cc44fa40c0cc87f986052ed8f7ae400cf254d7d626
2015-01-23 14:21:22 +00:00
Richard Peter
c9f7f32c39
Merge "Omaha #3918 Central registry web interface broken by DPA fix." into omaha_14.4.1
...
Former-commit-id: 4e80bdbd9ecc69519ce94e80bdbd9ecc69519ce9d7f79b859bd7f79b859bdcf20853249d1f4ee01185aa9fb637
2015-01-22 19:13:09 -06:00
Mark Peters
841bf0150c
Omaha #3768 Add localization to build.properties
...
Change-Id: I5f807ed34cf55868a9cf0883d9896cfaa5508b30
Former-commit-id: 30229a25f2db69f5a0bc30229a25f2db69f5a0bc7a69f354d97a69f354d9a176434c4132dbdc345fc6fd704642
2015-01-22 18:05:40 -06:00
Daniel.Huffman
8367208ad3
ASM #17057 RadarDecoder::AlertMessageSanityCheck
...
Change-Id: Iedf6a1255184a3bde4b9a879a5cc4a0ecfb0ef0c
Former-commit-id: f4ac238888845998cbfaf4ac238888845998cbfaa25fa81a0fa25fa81a0fc5a37c5e9c1fe93bcfa4ce963e91fa
2015-01-22 21:13:04 +00:00
Shawn.Hooper
eefc3bd57d
Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 095a22f5e3314a8497f8095a22f5e3314a8497f837c89530a637c89530a6dfd04fec4ac012f464c903fd6d11c5
2015-01-22 16:05:52 -05:00
Shawn.Hooper
c1555d3133
Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 7839dab5e60bc501bd4c7839dab5e60bc501bd4ca757b55446a757b55446e110ee143a6cf71bae0e953b71a3f8
2015-01-22 16:05:41 -05:00
Dave Hladky
9af205777f
Omaha #3918 Central registry web interface broken by DPA fix.
...
Former-commit-id: 5fd928ec4cc1127b066f5fd928ec4cc1127b066fa15e67385aa15e67385af3f75d02dc92fbbea65a60efde53e6
2015-01-22 13:22:18 -06:00
Nate Jensen
84379b24e2
Merge "Omaha #3993 ensure important dataplugin utility folders are included in viz builds" into omaha_14.4.1
...
Former-commit-id: 0d1414e56b16d862700a0d1414e56b16d862700a865852c20c865852c20c99dae46c58c06e1c0adb95bdbef8c4
2015-01-15 13:07:10 -06:00
David Lovely
62425dfbb3
Omaha #3957 Removed trailing slash in Spec for QPID.
...
Change-Id: Ief731b9e13701c19cd11bc383b1336e53d6174f5
Former-commit-id: 1f59c0cd211cfc27241f1f59c0cd211cfc27241fcf4077e8cdcf4077e8cdaf5df71b4cf7565da27d3babe6269f
2015-01-15 08:16:18 -06:00
David Lovely
55fbb2ad86
Omaha #3957 Fixed path in Installer.edex-environment for QPID.
...
Change-Id: I846d0793c646a2e6321ed74ab672f70407ff13ac
Former-commit-id: 2771afe7f463c36315592771afe7f463c36315590b7ee2dc080b7ee2dc080fa33b0e84f75e17f79e49e435ede3
2015-01-14 14:40:36 -06:00
Nate Jensen
b86874003f
Merge "Omaha #3709 unify collaboration color management" into omaha_14.4.1
...
Former-commit-id: 956845266cbdb58ec755956845266cbdb58ec7557c61d2c06d7c61d2c06dfa79e807824abf2a8a6c4837ead714
2015-01-14 14:05:18 -06:00
Brian Clements
0f521bee60
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: 17ccb3ab661c2d8e01d017ccb3ab661c2d8e01d08cc1aa9f338cc1aa9f33ba13ccb6f09a87cf77c561b3b6389e
2015-01-14 13:00:25 -06:00
Greg Armendariz
c7552ebaf9
Merge "Omaha #3957 Fixed path in Installer.edex-environment for QPID." into omaha_14.4.1
...
Former-commit-id: 6bdaf0b9246c7e615de56bdaf0b9246c7e615de504317833300431783330afe39c3dd6fff75342eb89c4169e18
2015-01-14 11:33:29 -06:00
David Lovely
4467128c35
Omaha #3957 Fixed path in Installer.edex-environment for QPID.
...
Change-Id: I22eea04180974e6d3cbcfb4fc4a2e18fe7823db9
Former-commit-id: e4dbe403b39b9d569062e4dbe403b39b9d569062f75230366cf75230366ce8150e977c5bbea995ae9316cbc4a4
2015-01-14 11:28:56 -06:00
Ben Steffensmeier
79d0ce0b70
Omaha #3966 Limit the number of flags on wind barbs.
...
Former-commit-id: dad3e9ed8c22f13c9f08dad3e9ed8c22f13c9f083a6bce11003a6bce1100f7d8dae6b97d9ff47dfa4b253097a1
2015-01-13 17:21:43 -06:00
Nate Jensen
7a14b2de0c
Omaha #3993 ensure important dataplugin utility folders are included in
...
viz builds
Change-Id: I3bb2a464f482995943e3729e439c3f0c8fbfe747
Former-commit-id: f88f62191f05307be9d0f88f62191f05307be9d0b434ae1343b434ae13439df5c9249b39ab8668fa69d8073d94
2015-01-13 16:47:04 -06:00
Ron Anderson
9b9d487ad6
Omaha #3997 Create script for sites to use to compare AreaDictionary.py files
...
Change-Id: I0b76c40ffe70d1df9d9379deca4bdc0276a723fd
Former-commit-id: d4ccf1c538ce0fa19f7bd4ccf1c538ce0fa19f7bb8fdaf17a4b8fdaf17a44919681992b5f578a4e1a8d2a64bd7
2015-01-13 15:11:42 -06:00
Ron Anderson
a04c7694d0
Omaha #3997 Create delta script to preserve the site's current AreaDictionary.py file
...
Change-Id: Id38826c171ed6d87fd8b677c53df7e2a6b49254c
Former-commit-id: 699573558f690861d350699573558f690861d35082aa416c4882aa416c487aaaf55ea8ac7a6945f84af148d7f0
2015-01-13 14:32:50 -06:00
Fay.Liang
70350e7c9a
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: 1934dedd2d13fb7810661934dedd2d13fb781066a09a27a963a09a27a96310a0b78dcc50513e1655c87c390019
2015-01-13 14:35:30 -05:00
cmadmin
c95f832d12
Merge "Omaha #3957 Moved QPID to build repository directory structure." into omaha_14.4.1
...
Former-commit-id: b9fac8ae475b796ff2f8b9fac8ae475b796ff2f8478e3825ae478e3825ae8d5cd7a6d6b5c32338804e04d6093e
2015-01-13 09:14:43 -06:00
Nate Jensen
2ab1455029
Merge "Omaha #3709 reworked custom user color configuration" into omaha_14.4.1
...
Former-commit-id: bb5b975ae065a0433605bb5b975ae065a0433605511ba87c5c511ba87c5c7d2f617c95a9e4546f6ae75e025fe4
2015-01-12 13:59:25 -06:00
Slav Korolev
7c7c14b192
Omaha #3220 - Replaced MonitoringArea class with individual area configuration managers.
...
Former-commit-id: f08d184cfc9c57dab437f08d184cfc9c57dab437b8ab18d3e1b8ab18d3e16c73aca047790a79e752a6e0502c58
2015-01-12 14:32:31 -05:00
Fay.Liang
1e9024ede9
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: 6b77894bd0c6bd5d76756b77894bd0c6bd5d7675eed6737801eed6737801f3ecae85735cc8e5b4af06ac6b396e
2015-01-12 13:03:31 -05:00
Brian Clements
d577a1d181
Omaha #3709 reworked custom user color configuration
...
Change-Id: I8b69dc378976684e989cae883e99ade9553c04d3
Former-commit-id: 911b007d953d33ce1341911b007d953d33ce134146c0d7d42c46c0d7d42c42d54b3dacc354fa93db29ec52418c
2015-01-12 11:06:57 -06:00
Nate Jensen
07013d200f
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: c37ffcde9044f0f7aafcc37ffcde9044f0f7aafc06054344dd06054344ddba3b185a4dcf448004b93d3f683ba5
2015-01-12 09:22:30 -06:00
Michael Gamazaychikov
feffeee72e
ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable.
...
Change-Id: Ife5ecb2c5823d4d34c1b4af6dc53fa360074b7bb
Former-commit-id: 1aa98e754abae8d9ea3f1aa98e754abae8d9ea3fe007fac30fe007fac30f1c3882e344f034b8dab185a439fb39
2015-01-09 15:07:29 -05:00
Juliya Dynina
84032a4d9b
Merge "ASM #14246 - Implemented MPE Transmit Best Estimate option" into asm_14.4.1
...
Former-commit-id: 898380889c0113c27937898380889c0113c279373bf0aebf643bf0aebf649ebfcec33f6a4f936e9b5bd95b83c7
2015-01-08 11:49:18 -05:00
Loubna.Bousaidi
c83ade000b
ASM #14246 - Implemented MPE Transmit Best Estimate option
...
Change-Id: If6dc3df81ecfee998ebcc4de8ee47ddc2466868e
Former-commit-id: 79ae030ca64a769ef56079ae030ca64a769ef560f2476cae94f2476cae947aa40a06541e849a4bba7226e889f8
2015-01-08 15:31:58 +00:00
Ying-Lian.Shi
7ce668ce74
ASM #15035 - Add SFMG WNJ GFE Domain definition to baseline serverConfig, double quote to sigle quote
...
Change-Id: I9c652fdc3440d8c15a0c443a6b80a8a10877693e
Former-commit-id: 4109770c593e1d1aa8144109770c593e1d1aa814c99e199a69c99e199a69874b4b0f6437ce7e968b8102688bd1
2015-01-08 15:28:54 +00:00
David Lovely
9c401ce4ea
Omaha #3957 Moved QPID to build repository directory structure.
...
Change-Id: Idee474cb4dd3d9366acfad941bedcf3c999be084
Former-commit-id: 208dd5de01240927c241208dd5de01240927c241e56002debfe56002debf9f09af1c8ad860af2218b67b97803c
2015-01-07 12:03:10 -06:00
Slav Korolev
cb5037ba90
Omaha #3937 - Removed UELE - Index out of bounds.
...
Former-commit-id: 13ef257a0dc215b4c91b13ef257a0dc215b4c91bda0d46ad81da0d46ad81a9f642af5b32b5dc892844a4f7220d
2015-01-07 12:20:08 -05:00
Juliya Dynina
44cbe51d63
Merge "ASM #632 -Filter erroneous RPG alert messages." into asm_14.4.1
...
Former-commit-id: 206a985f23d0072cd181206a985f23d0072cd1812efa96316e2efa96316e6c868a9c742ab78c21f2f413e2c31e
2015-01-07 09:02:32 -05:00
Daniel.Huffman
9b6f13244f
ASM #632 -Filter erroneous RPG alert messages.
...
Change-Id: Iacab9ba170ac0f267ac7eedeaf81113a687c988e
Former-commit-id: 22f923eaf59db291b29622f923eaf59db291b2967a563dd5057a563dd505ccc9cf5662c7b973493f93e0aad16e
2015-01-07 00:41:35 +00:00
Dave Hladky
c038b51e8e
Omaha #3918 Fix for standalone clients not starting due to central registry non-existance.
...
Change-Id: I78ed5dd75e94d567d934acfae098d59364a62292
Former-commit-id: c6aca09cf366aa4b2fbfc6aca09cf366aa4b2fbf36ab95205f36ab95205f87aeba1177f8214a64cda32499a14a
2015-01-06 14:37:01 -06:00
Juliya Dynina
97fcdc6c1d
Merge "ASM #16969 - NativeLib: Update 32bit versions of Java and Postgresql to latest versions." into asm_14.4.1
...
Former-commit-id: cc0424d4704dca647a51cc0424d4704dca647a51e439d3845fe439d3845f3a3c55d8704079e43c193b62980204
2015-01-06 15:16:33 -05:00
steve.naples
bd1539e397
ASM #16969 - NativeLib: Update 32bit versions of Java and Postgresql to latest versions.
...
Change-Id: I23a4dae2aef9bdf71848c1e9a3338e1bddc39205
Former-commit-id: 7f8716267ff53fb9c4047f8716267ff53fb9c404bdbdc68b2abdbdc68b2a4630ed499fb89b70f22d61c4126aaf
2015-01-06 19:49:03 +00:00
Brian Clements
3ec63f55b8
Omaha #2707 replaced LSR officeId constraint with stationId
...
Change-Id: I05fef0c56801fa907e45da3400437e71ce0e38dd
Former-commit-id: 111c81d35cacc9e8630d111c81d35cacc9e8630dac952bc760ac952bc760877190a87f0d29964efc0a0547b474
2015-01-06 12:33:06 -06:00
Nate Jensen
fb038b5f9e
Merge "Omaha #3709 Fix some minor issues with collaboration colors." into omaha_14.4.1
...
Former-commit-id: 5ea76c4f3d33229e28715ea76c4f3d33229e2871b8f1475a3cb8f1475a3cfae5ed4e5f4a547884b5f5db894b86
2015-01-05 13:06:21 -06:00
Mark Peters
aa4db73f94
Omaha #3709 Fix some minor issues with collaboration colors.
...
Change-Id: I07fbcd6db21c3ee3b5fa404ad1c004af7e3ac057
Former-commit-id: 6df0145869530b52d7db6df0145869530b52d7db7cc21da4197cc21da4193ff2238ced75bc5c4ed9308d4aa4a5
2015-01-05 12:57:42 -06:00
Richard Peter
59a72b39ec
Merge "Omaha #3600 Implement getAvailableLevels() for radar to increase inventory performance." into omaha_14.4.1
...
Former-commit-id: 341197be9238f1ef0e8f341197be9238f1ef0e8fbe845aea5fbe845aea5f53e41d4d5a8a2358f46af99847bfea
2015-01-05 11:35:04 -06:00
Rici.Yu
d43b569d29
ASM #16942 - GFE: VTEC Active Tables not getting purged
...
Change-Id: Ia00f0c5d9f0a9f8abadde271f3608fd4e786a60b
Former-commit-id: 4d10daca1f97c7681e014d10daca1f97c7681e01483d0216da483d0216da56b0d27d37562ea0d5664ddd8c5c15
2014-12-30 13:56:02 -05:00
Stephen Gilbert
edf74e6a81
VLab Issue #4078 - Add project gov.noaa.nws.ncep.viz.rtkp.
...
It was lost in last merge from ncep_14.2.2-n branch.
Change-Id: Ica2fcdcbc7fea944fbaca26a4c916a9d22e216d4
Former-commit-id: 69f694079031c1388d7b69f694079031c1388d7b53eac04e5253eac04e527a8dd56ad6983891787dc2c4a4592b
2014-12-30 13:44:32 -05:00
Stephen Gilbert
260fbacf1b
VLab Issue #5749 - Removed uEngine and PDO dependencies
...
Change-Id: I3368b5cb82b6782e3934b37c5175c9e936768815
Former-commit-id: 65f56b863f1cc30e4a1265f56b863f1cc30e4a1279d5a192bf79d5a192bf16290cff3d1e0869c0d78c075a5640
2014-12-30 13:28:32 -05:00
Juliya Dynina
33641f8869
Merge "ASM #16952 - Fixed the bug in the estimated precip values algorithm." into asm_14.4.1
...
Former-commit-id: 6884c46ee9757a3f72e86884c46ee9757a3f72e8807ac7dfbc807ac7dfbcbdca475dae568a214ec49795afeefd
2014-12-24 07:57:10 -05:00
