Commit graph

7821 commits

Author SHA1 Message Date
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
Steve Harris
8cc8138832 Merge branch 'omaha_14.4.1' into omaha_pgen
Former-commit-id: f742cb887192183a29f4984d7f95a299cad9867a
2015-01-13 11:18:52 -06:00
Ron Anderson
03c265fc9f Issue #3990 Remove multiple smartInit restriction added by DR #3146
Change-Id: I6231da05828bcc76489793c7cf8acd29468b4516

Former-commit-id: c4ba2394228935c7725688c11b91c3de130d586b
2015-01-13 11:03:02 -06:00
Fay.Liang
b7e84f200a Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 1627b2a1d7705ae60f8f18545460d29fed1acf3a
2015-01-13 11:58:33 -05:00
Fay.Liang
ffa13d9264 Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: f0ed1b055a21c765e6dec0dde0a066089892dd06
2015-01-13 11:58:25 -05:00
Nathan Jensen
0f8d012034 Merge "VLab Issue #5413 - Changes for PGEN in D2D for mouse click" into omaha_pgen
Former-commit-id: 76b63bd71b9c38d5c85906df6be75db0b31fed8c
2015-01-13 16:48:36 +00:00
Fay.Liang
5582b8e999 Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: 35b63703798294e9c28c6aa1d5884a41c0538e09
2015-01-13 11:41:48 -05:00
Sarah Pontius
4bacb954fe VLab Issue #5879 - HLS/TCV Post-SwIT Changes; fixes #5879
Change-Id: I0418ffe2cb01337f8549ea2c8021a8e5b566b563

Former-commit-id: 01f727b4b033f80a206533cbf5404c38d12a6fde
2015-01-13 09:04:28 -07: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
Fay.Liang
d193ca5eb6 Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: f0c6dcb30718baede5c31bcb267d3b4524252ab8
2015-01-12 14:55:55 -05: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
steve.naples
ac7d038488 ASM #16993 - Restored code to DrawPolygonDlg to use Combo box for fields.
Change-Id: I736af4ac43de16c3978c462fca22bb147846d81b

Former-commit-id: 3a8aaf4ab99e8ae93dd9f074c5671cc8f3dc5f8d
2015-01-12 19:08:06 +00: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
Ana Rivera
3a08e54bfc Merge "VLab Issue #4953 Run NWRWAVES script for both TCV and HLS. Don't attempt to send TCV backup files in practice mode." into tcv_14.3.2
Former-commit-id: 07634aa73cbb07182302518513a54ded9fd69641
2015-01-12 17:43:07 +00: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
Sarah Pontius
c31b766be6 VLab Issue #5879 - HLS/TCV Post-SwIT Changes; fixes #5879
Change-Id: I248822f54d31eb5e0a7312171acf1d59dde7c73d

Former-commit-id: 9cf4ca3c746accf745172bd7dc85e851da95ab6f
2015-01-09 15:13:45 -07: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
Ron Anderson
57de590a3e VLab Issue #4953 Run NWRWAVES script for both TCV and HLS.
Don't attempt to send TCV backup files in practice mode.

Change-Id: I70cc4a4014a0f1e34d8c2d3eab39a76289ca9daa

Former-commit-id: 3a60037251b7dd393d85a613c5685d5338927e61
2015-01-09 10:48:51 -06:00
Fay.Liang
2f2992f519 Merge branch 'omaha_14.3.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 1684997e12b53709c6c7226077f48043d0f99d07
2015-01-09 09:47:03 -05:00
Fay.Liang
2d6ea32416 Merge branch 'ohd_14.3.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 4c5e26d5c46fa36119666756ead4554eaeb860c1
2015-01-09 09:46:26 -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
Bradley Mabe
5e2884158c VLab Issue #5840 - Fix NSHARP freeze when loading a sounding from
HiRes-ARW/NMM models

Change-Id: I976d2e26298ca4f1b82d9373e128e772da1a87fd

Former-commit-id: 06e10e6a675759b1c9e29ff4355e528d4eba9e00
2015-01-07 16:40:22 -05: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
Chip Gobs
4376118942 VLab Issue #5831 - MPE: Fix broken cv_use for DualPol functionality; fixes #5831
Change-Id: I98bb54b48910dbf818daeb0312815dab1a99a4bc

Former-commit-id: 85491d6fc3bf8aa53e62d5cb139918166d48bdde
2015-01-07 12:32:50 -05: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
Mike Duff
7830409745 Issue #3026 - Add bias hpe to hpe test
Former-commit-id: fd4f8b2ef5ab128e396f4fa82c0d8f5721f9d298
2015-01-06 14:50:20 -06:00
Dave Hladky
66aa4b2fbf Omaha #3918 Fix for standalone clients not starting due to central registry non-existance.
Change-Id: I78ed5dd75e94d567d934acfae098d59364a62292

Former-commit-id: d8a52577bbe13f53f9afbbae354e8bc58e11a0ed
2015-01-06 14:37:01 -06:00
Juliya Dynina
4dca647a51 Merge "ASM #16969 - NativeLib: Update 32bit versions of Java and Postgresql to latest versions." into asm_14.4.1
Former-commit-id: a307a3331eef80ea6dc459f352ea2dccf2ea4bf6
2015-01-06 15:16:33 -05:00
steve.naples
f53fb9c404 ASM #16969 - NativeLib: Update 32bit versions of Java and Postgresql to latest versions.
Change-Id: I23a4dae2aef9bdf71848c1e9a3338e1bddc39205

Former-commit-id: 28f92f6b49d286f7c470bda6184d12b7882bb768
2015-01-06 19:49:03 +00:00
Brian Clements
acc9e8630d Omaha #2707 replaced LSR officeId constraint with stationId
Change-Id: I05fef0c56801fa907e45da3400437e71ce0e38dd

Former-commit-id: e0cd69f020d351f0aaefd5b35ffb369e44a04e48
2015-01-06 12:33:06 -06:00
Steve Harris
6a1c0969f3 Merge branch 'omaha_14.4.1' into omaha_pgen
Former-commit-id: 2e1289d9b97c838bb5af464c1ef94bac761f485c
2015-01-06 11:22:28 -06:00
Nate Jensen
33229e2871 Merge "Omaha #3709 Fix some minor issues with collaboration colors." into omaha_14.4.1
Former-commit-id: d617935ead64cdaf51481aa46fc0bf2e07215696
2015-01-05 13:06:21 -06:00
Mark Peters
530b52d7db Omaha #3709 Fix some minor issues with collaboration colors.
Change-Id: I07fbcd6db21c3ee3b5fa404ad1c004af7e3ac057

Former-commit-id: f028c5040e50d3a2c96294d5c4d7ddd0e360defb
2015-01-05 12:57:42 -06:00
Richard Peter
38f1ef0e8f Merge "Omaha #3600 Implement getAvailableLevels() for radar to increase inventory performance." into omaha_14.4.1
Former-commit-id: 429f7038e0342ccc1673e85c40cbc1f011a70410
2015-01-05 11:35:04 -06:00
Steve Harris
d8b5f37d9c Merge branch 'master_14.3.1' (14.3.1-41) into omaha_14.3.1
Former-commit-id: d3a514a4604616a20f21489212feb92db4138dfc
2015-01-04 17:12:18 -06:00
Rici.Yu
97c7681e01 ASM #16942 - GFE: VTEC Active Tables not getting purged
Change-Id: Ia00f0c5d9f0a9f8abadde271f3608fd4e786a60b

Former-commit-id: a98e1f924bf0b99657dd56241c02f529c5e48ce7
2014-12-30 13:56:02 -05:00
Stephen Gilbert
31c1388d7b 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: 65f44141c0855411255e69dd7c7bfd11c7ff74b6
2014-12-30 13:44:32 -05:00
Stephen Gilbert
1cc30e4a12 VLab Issue #5749 - Removed uEngine and PDO dependencies
Change-Id: I3368b5cb82b6782e3934b37c5175c9e936768815

Former-commit-id: 097f9f63433b71433f4c5503ca6a80fb8fd6a4a6
2014-12-30 13:28:32 -05:00
Juliya Dynina
757a3f72e8 Merge "ASM #16952 - Fixed the bug in the estimated precip values algorithm." into asm_14.4.1
Former-commit-id: f177c49913decebd60106cd380616c4aba24c62c
2014-12-24 07:57:10 -05:00
Loubna.Bousaidi
d6db8867e9 ASM #16952 - Fixed the bug in the estimated precip values algorithm.
Change-Id: I065fc7744747e52c7f10c499f5b100ef60e25e44

Former-commit-id: 33872d6facbcb1da29847f1edfd7e29c65621b8e
2014-12-23 14:48:29 +00:00
Fay.Liang
06061eee19 Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: 0edb5ba1c9cad9e2933ab86d57ec5e4f355d244d
2014-12-22 14:43:32 -05:00
Bingfan Yin
3f38e3c88d VLab Issue #5749 - Removed try/catch for ContinuingWatch when querying database.
Change-Id: I73e4644f810c0d649a7bed61135989a9c15c1981

Former-commit-id: 75971fafd69e6a19a9cfd120d1a70f76f3c5fee1
2014-12-22 14:05:07 -05:00