Shawn.Hooper
9114790e29
ASM #16969 - Update jdk tarball with correct version
...
Change-Id: I1a6a445159f39168dc070783548d443a82225bd3
Former-commit-id: 00d89c9b8d
[formerly 623724f2920280470ef0f60ff4c263754917591e]
Former-commit-id: fa40885eb7
2015-01-29 14:23:23 -05:00
Fay.Liang
4c69a4bc24
Merge branch 'master_14.4.1' into asm_14.4.1
...
Former-commit-id: e8b40ad087
[formerly 8c72e62260026a2d1d2fb41839f1e79535b09b7f]
Former-commit-id: 8aa0a2a200
2015-01-28 14:31:02 -05:00
Fay.Liang
65d91d9113
Merge branch 'emc_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 7bc10075e5
[formerly 6ad30059fa7249aba100a39c7c39215212a929cc]
Former-commit-id: d29d86ad05
2015-01-27 12:08:28 -05:00
Ana Rivera
f565ef4315
Merge branch 'emc_14.4.1' of gerrit:AWIPS2_Dev_Baseline into emc_14.4.1
...
Former-commit-id: dee10b3f6f
[formerly 6c72e1864ad5843c4ac42a558b589777af047c77]
Former-commit-id: 171a38175c
2015-01-26 19:04:54 +00:00
Ana Rivera
654d08a588
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: 7c25945fd9
[formerly 51ef304bd94fd003a1e7349a22c41e21b340ac8a]
Former-commit-id: 98ac97e397
2015-01-26 18:45:26 +00:00
Shawn.Hooper
e6c4f29036
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: e84a037b2e
[formerly 95cdc2d817eac840017fc14746c2ada498f1a716]
Former-commit-id: 568b7c801a
2015-01-26 11:22:49 -05:00
Steve Harris
8cd9e2e92f
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: 0f05c53a53
[formerly 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79]
Former-commit-id: 158fa16376
2015-01-23 09:08:06 -06:00
Ana Rivera
de1b989253
VLab Issue #5945 - Update NWPS: Run_NWPS.py; fixes #5945
...
Change-Id: Ib0d4356bd5d2c99f33204bf88bf65fe9a7db3278
Former-commit-id: 44fa40c0cc
[formerly 653472d785f4af6fef8f2edd93c2e538806096ab]
Former-commit-id: 705f02f2be
2015-01-23 14:21:22 +00:00
Richard Peter
4e80bdbd9e
Merge "Omaha #3918 Central registry web interface broken by DPA fix." into omaha_14.4.1
...
Former-commit-id: d7f79b859b
[formerly 7591f6aa787a52c4fd2d6f9cb9917a1c62380fb5]
Former-commit-id: cc69519ce9
2015-01-22 19:13:09 -06:00
Mark Peters
30229a25f2
Omaha #3768 Add localization to build.properties
...
Change-Id: I5f807ed34cf55868a9cf0883d9896cfaa5508b30
Former-commit-id: 7a69f354d9
[formerly a6cafa7a07d33376cda3cc3a69437e45b6e0330f]
Former-commit-id: db69f5a0bc
2015-01-22 18:05:40 -06:00
Daniel.Huffman
f4ac238888
ASM #17057 RadarDecoder::AlertMessageSanityCheck
...
Change-Id: Iedf6a1255184a3bde4b9a879a5cc4a0ecfb0ef0c
Former-commit-id: a25fa81a0f
[formerly 498f55c757f20f70b11a921a2e5948c3c7c49c90]
Former-commit-id: 845998cbfa
2015-01-22 21:13:04 +00:00
Shawn.Hooper
095a22f5e3
Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 37c89530a6
[formerly 60d478ab66ac20c8434b9eb9e4d9f029390f0ba6]
Former-commit-id: 314a8497f8
2015-01-22 16:05:52 -05:00
Shawn.Hooper
7839dab5e6
Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: a757b55446
[formerly d53c809149da23fcae51138cc45c57aecd641794]
Former-commit-id: 0bc501bd4c
2015-01-22 16:05:41 -05:00
Dave Hladky
5fd928ec4c
Omaha #3918 Central registry web interface broken by DPA fix.
...
Former-commit-id: a15e67385a
[formerly 5aa305adb5fd16c72ce557309cab28fd287379d9]
Former-commit-id: c1127b066f
2015-01-22 13:22:18 -06:00
Nate Jensen
0d1414e56b
Merge "Omaha #3993 ensure important dataplugin utility folders are included in viz builds" into omaha_14.4.1
...
Former-commit-id: 865852c20c
[formerly 6557237cd4cea3300292e1612622547c23bdde2c]
Former-commit-id: 16d862700a
2015-01-15 13:07:10 -06:00
David Lovely
1f59c0cd21
Omaha #3957 Removed trailing slash in Spec for QPID.
...
Change-Id: Ief731b9e13701c19cd11bc383b1336e53d6174f5
Former-commit-id: cf4077e8cd
[formerly 5fe598aef48f91e57d8f233872ccd0bab395164e]
Former-commit-id: 1cfc27241f
2015-01-15 08:16:18 -06:00
David Lovely
2771afe7f4
Omaha #3957 Fixed path in Installer.edex-environment for QPID.
...
Change-Id: I846d0793c646a2e6321ed74ab672f70407ff13ac
Former-commit-id: 0b7ee2dc08
[formerly 8107830bf2fa384c3bbe9472801c89a2a43990a3]
Former-commit-id: 63c3631559
2015-01-14 14:40:36 -06:00
Nate Jensen
956845266c
Merge "Omaha #3709 unify collaboration color management" into omaha_14.4.1
...
Former-commit-id: 7c61d2c06d
[formerly fa93fe561ae1ad49979ab657b4a537dc7731af8e]
Former-commit-id: bdb58ec755
2015-01-14 14:05:18 -06:00
Brian Clements
17ccb3ab66
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: 8cc1aa9f33
[formerly c0cd560fb1b6e8c04047c0d7b7d407e9072f0cec]
Former-commit-id: 1c2d8e01d0
2015-01-14 13:00:25 -06:00
Greg Armendariz
6bdaf0b924
Merge "Omaha #3957 Fixed path in Installer.edex-environment for QPID." into omaha_14.4.1
...
Former-commit-id: 0431783330
[formerly 7c37c3ef1e9822a988f2f3aff9e884fbe48dce9c]
Former-commit-id: 6c7e615de5
2015-01-14 11:33:29 -06:00
David Lovely
e4dbe403b3
Omaha #3957 Fixed path in Installer.edex-environment for QPID.
...
Change-Id: I22eea04180974e6d3cbcfb4fc4a2e18fe7823db9
Former-commit-id: f75230366c
[formerly 34faf643b5de3c01713e0129209efb4ccc2c2aa0]
Former-commit-id: 9b9d569062
2015-01-14 11:28:56 -06:00
Ben Steffensmeier
dad3e9ed8c
Omaha #3966 Limit the number of flags on wind barbs.
...
Former-commit-id: 3a6bce1100
[formerly 8b0ce01043b4ba2858dacb5ceeb41299f5c2044d]
Former-commit-id: 22f13c9f08
2015-01-13 17:21:43 -06:00
Nate Jensen
f88f62191f
Omaha #3993 ensure important dataplugin utility folders are included in
...
viz builds
Change-Id: I3bb2a464f482995943e3729e439c3f0c8fbfe747
Former-commit-id: b434ae1343
[formerly 9f30c7195d6a62206bae05d6e17df4a8e068255e]
Former-commit-id: 05307be9d0
2015-01-13 16:47:04 -06:00
Ron Anderson
d4ccf1c538
Omaha #3997 Create script for sites to use to compare AreaDictionary.py files
...
Change-Id: I0b76c40ffe70d1df9d9379deca4bdc0276a723fd
Former-commit-id: b8fdaf17a4
[formerly 23b10f94f9ff892fdbff654e6fefbd4b3c914f58]
Former-commit-id: ce0fa19f7b
2015-01-13 15:11:42 -06:00
Ron Anderson
699573558f
Omaha #3997 Create delta script to preserve the site's current AreaDictionary.py file
...
Change-Id: Id38826c171ed6d87fd8b677c53df7e2a6b49254c
Former-commit-id: 82aa416c48
[formerly 9da286a579c582db47d63aba83552f5361d819e0]
Former-commit-id: 690861d350
2015-01-13 14:32:50 -06:00
Fay.Liang
1934dedd2d
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: a09a27a963
[formerly 67315d8c5f28f5ed5e0870f65de30a9c2c2bd290]
Former-commit-id: 13fb781066
2015-01-13 14:35:30 -05:00
cmadmin
b9fac8ae47
Merge "Omaha #3957 Moved QPID to build repository directory structure." into omaha_14.4.1
...
Former-commit-id: 478e3825ae
[formerly 455b763fd46e6053e272854e89074cdb898d4a6c]
Former-commit-id: 5b796ff2f8
2015-01-13 09:14:43 -06:00
Nate Jensen
bb5b975ae0
Merge "Omaha #3709 reworked custom user color configuration" into omaha_14.4.1
...
Former-commit-id: 511ba87c5c
[formerly d7cc45aa26f71ad81d82dc1dfa2541e105b4c76c]
Former-commit-id: 65a0433605
2015-01-12 13:59:25 -06:00
Slav Korolev
f08d184cfc
Omaha #3220 - Replaced MonitoringArea class with individual area configuration managers.
...
Former-commit-id: b8ab18d3e1
[formerly 00fd20d76a4ea46e9806bad11b1bc5a2acc42d6e]
Former-commit-id: 9c57dab437
2015-01-12 14:32:31 -05:00
Fay.Liang
6b77894bd0
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: eed6737801
[formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]
Former-commit-id: c6bd5d7675
2015-01-12 13:03:31 -05:00
Brian Clements
911b007d95
Omaha #3709 reworked custom user color configuration
...
Change-Id: I8b69dc378976684e989cae883e99ade9553c04d3
Former-commit-id: 46c0d7d42c
[formerly 18825c076fe273c9ae2e8040ccea2de0698b2877]
Former-commit-id: 3d33ce1341
2015-01-12 11:06:57 -06:00
Nate Jensen
c37ffcde90
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: 06054344dd
[formerly 5fc926b7e735f2c92b16a85a7ba5f663a443ea53]
Former-commit-id: 44f0f7aafc
2015-01-12 09:22:30 -06:00
Michael Gamazaychikov
1aa98e754a
ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable.
...
Change-Id: Ife5ecb2c5823d4d34c1b4af6dc53fa360074b7bb
Former-commit-id: e007fac30f
[formerly 38eabd6196df1576970019f2b0255d3f39a825a9]
Former-commit-id: bae8d9ea3f
2015-01-09 15:07:29 -05:00
Juliya Dynina
898380889c
Merge "ASM #14246 - Implemented MPE Transmit Best Estimate option" into asm_14.4.1
...
Former-commit-id: 3bf0aebf64
[formerly d0f721f3fe93b87ca3670264a2abdf9b3b64bff8]
Former-commit-id: 0113c27937
2015-01-08 11:49:18 -05:00
Loubna.Bousaidi
79ae030ca6
ASM #14246 - Implemented MPE Transmit Best Estimate option
...
Change-Id: If6dc3df81ecfee998ebcc4de8ee47ddc2466868e
Former-commit-id: f2476cae94
[formerly 212076c520952d0327591b79449ae09ad063adf1]
Former-commit-id: 4a769ef560
2015-01-08 15:31:58 +00:00
Ying-Lian.Shi
4109770c59
ASM #15035 - Add SFMG WNJ GFE Domain definition to baseline serverConfig, double quote to sigle quote
...
Change-Id: I9c652fdc3440d8c15a0c443a6b80a8a10877693e
Former-commit-id: c99e199a69
[formerly af67fa0f955b35c7b9b141fef507a5db805eaa27]
Former-commit-id: 3e1d1aa814
2015-01-08 15:28:54 +00:00
David Lovely
208dd5de01
Omaha #3957 Moved QPID to build repository directory structure.
...
Change-Id: Idee474cb4dd3d9366acfad941bedcf3c999be084
Former-commit-id: e56002debf
[formerly f27b0c6b92b4c744493e44b510defe3d650ca1f6]
Former-commit-id: 240927c241
2015-01-07 12:03:10 -06:00
Slav Korolev
13ef257a0d
Omaha #3937 - Removed UELE - Index out of bounds.
...
Former-commit-id: da0d46ad81
[formerly 039a382cf7a891cecdc7bbb1b0b5d83e02a7df13]
Former-commit-id: c215b4c91b
2015-01-07 12:20:08 -05:00
Juliya Dynina
206a985f23
Merge "ASM #632 -Filter erroneous RPG alert messages." into asm_14.4.1
...
Former-commit-id: 2efa96316e
[formerly 503e8a59c9608c3094d817e3e2d5e07250c0e0e5]
Former-commit-id: d0072cd181
2015-01-07 09:02:32 -05:00
Daniel.Huffman
22f923eaf5
ASM #632 -Filter erroneous RPG alert messages.
...
Change-Id: Iacab9ba170ac0f267ac7eedeaf81113a687c988e
Former-commit-id: 7a563dd505
[formerly d7d3bc55053f16da410d3ebe1ef055e93d198790]
Former-commit-id: 9db291b296
2015-01-07 00:41:35 +00:00
Dave Hladky
c6aca09cf3
Omaha #3918 Fix for standalone clients not starting due to central registry non-existance.
...
Change-Id: I78ed5dd75e94d567d934acfae098d59364a62292
Former-commit-id: 36ab95205f
[formerly d8a52577bbe13f53f9afbbae354e8bc58e11a0ed]
Former-commit-id: 66aa4b2fbf
2015-01-06 14:37:01 -06:00
Juliya Dynina
cc0424d470
Merge "ASM #16969 - NativeLib: Update 32bit versions of Java and Postgresql to latest versions." into asm_14.4.1
...
Former-commit-id: e439d3845f
[formerly a307a3331eef80ea6dc459f352ea2dccf2ea4bf6]
Former-commit-id: 4dca647a51
2015-01-06 15:16:33 -05:00
steve.naples
7f8716267f
ASM #16969 - NativeLib: Update 32bit versions of Java and Postgresql to latest versions.
...
Change-Id: I23a4dae2aef9bdf71848c1e9a3338e1bddc39205
Former-commit-id: bdbdc68b2a
[formerly 28f92f6b49d286f7c470bda6184d12b7882bb768]
Former-commit-id: f53fb9c404
2015-01-06 19:49:03 +00:00
Brian Clements
111c81d35c
Omaha #2707 replaced LSR officeId constraint with stationId
...
Change-Id: I05fef0c56801fa907e45da3400437e71ce0e38dd
Former-commit-id: ac952bc760
[formerly e0cd69f020d351f0aaefd5b35ffb369e44a04e48]
Former-commit-id: acc9e8630d
2015-01-06 12:33:06 -06:00
Nate Jensen
5ea76c4f3d
Merge "Omaha #3709 Fix some minor issues with collaboration colors." into omaha_14.4.1
...
Former-commit-id: b8f1475a3c
[formerly d617935ead64cdaf51481aa46fc0bf2e07215696]
Former-commit-id: 33229e2871
2015-01-05 13:06:21 -06:00
Mark Peters
6df0145869
Omaha #3709 Fix some minor issues with collaboration colors.
...
Change-Id: I07fbcd6db21c3ee3b5fa404ad1c004af7e3ac057
Former-commit-id: 7cc21da419
[formerly f028c5040e50d3a2c96294d5c4d7ddd0e360defb]
Former-commit-id: 530b52d7db
2015-01-05 12:57:42 -06:00
Richard Peter
341197be92
Merge "Omaha #3600 Implement getAvailableLevels() for radar to increase inventory performance." into omaha_14.4.1
...
Former-commit-id: be845aea5f
[formerly 429f7038e0342ccc1673e85c40cbc1f011a70410]
Former-commit-id: 38f1ef0e8f
2015-01-05 11:35:04 -06:00
Rici.Yu
4d10daca1f
ASM #16942 - GFE: VTEC Active Tables not getting purged
...
Change-Id: Ia00f0c5d9f0a9f8abadde271f3608fd4e786a60b
Former-commit-id: 483d0216da
[formerly a98e1f924bf0b99657dd56241c02f529c5e48ce7]
Former-commit-id: 97c7681e01
2014-12-30 13:56:02 -05:00
Stephen Gilbert
69f6940790
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: 53eac04e52
[formerly 65f44141c0855411255e69dd7c7bfd11c7ff74b6]
Former-commit-id: 31c1388d7b
2014-12-30 13:44:32 -05:00
Stephen Gilbert
65f56b863f
VLab Issue #5749 - Removed uEngine and PDO dependencies
...
Change-Id: I3368b5cb82b6782e3934b37c5175c9e936768815
Former-commit-id: 79d5a192bf
[formerly 097f9f63433b71433f4c5503ca6a80fb8fd6a4a6]
Former-commit-id: 1cc30e4a12
2014-12-30 13:28:32 -05:00