Commit graph

3529 commits

Author SHA1 Message Date
Steve Harris
50468f63c5 Merge tag 'OB_14.4.1-7m' into omaha_14.4.1
14.4.1-7


Former-commit-id: 2468be4dd1 [formerly 8f2af8e359 [formerly f428e16ebb] [formerly 2468be4dd1 [formerly 88b43275725882327d4487733e3135489874de1f]]]
Former-commit-id: 8f2af8e359 [formerly f428e16ebb]
Former-commit-id: 8f2af8e359
Former-commit-id: dfa3bb1060
2015-02-03 17:18:57 -06:00
Steve Harris
2356f94a5e Merge tag 'OB_14.4.1-6m' into omaha_14.4.1
14.4.1-6


Former-commit-id: b684848820 [formerly 80dae4bc15 [formerly db185ed16c] [formerly b684848820 [formerly 6873606777f0c7c18928b0b0814050742c256dc2]]]
Former-commit-id: 80dae4bc15 [formerly db185ed16c]
Former-commit-id: 80dae4bc15
Former-commit-id: d0a1514ece
2015-02-03 11:24:39 -06:00
Fay.Liang
acadbd02f3 Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: f1c34884a5 [formerly 5550322f62 [formerly ae85ade54d] [formerly f1c34884a5 [formerly 06a34c609a217ca98b027ac6d92a31faf802b668]]]
Former-commit-id: 5550322f62 [formerly ae85ade54d]
Former-commit-id: 5550322f62
Former-commit-id: eafbc466a4
2015-02-03 11:24:57 -05:00
Richard Peter
126696c12b Merge "Omaha #4031 Implement preferrred AFOS first letter." into omaha_14.4.1
Former-commit-id: a3a4c9b0b7 [formerly a63c9099c8 [formerly 166bf912bd] [formerly a3a4c9b0b7 [formerly 28d8103fc3287f27edccc6187ca3df5d72726d97]]]
Former-commit-id: a63c9099c8 [formerly 166bf912bd]
Former-commit-id: a63c9099c8
Former-commit-id: d48f07ebeb
2015-02-02 12:49:01 -06:00
Ana Rivera
551831fb59 Merge branch 'master_14.4.1' into gsd_14.4.1
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5

Former-commit-id: 070f0136ec [formerly ccd0a40621 [formerly ea92049aac] [formerly 070f0136ec [formerly d5996a81aad0809aaddbb8df99a985c86c66aaf8]]]
Former-commit-id: ccd0a40621 [formerly ea92049aac]
Former-commit-id: ccd0a40621
Former-commit-id: 2be03903bc
2015-01-30 19:29:29 +00:00
Roger Ferrel
1396ef3754 Omaha #4031 Implement preferrred AFOS first letter.
Change-Id: I1c011beaf078d08c79c02863ac8afd01c7318645

Former-commit-id: 61ab864445 [formerly fca30b70f5 [formerly 28f435a27f] [formerly 61ab864445 [formerly 776989760fa936913006924efb1e84832ffec31f]]]
Former-commit-id: fca30b70f5 [formerly 28f435a27f]
Former-commit-id: fca30b70f5
Former-commit-id: fa46ebe8a7
2015-01-30 13:01:01 -06:00
Slav Korolev
d669e3af69 Omaha #3220 - Performance - Safe Seas, Snow, Fog.
Former-commit-id: 9e076f7970 [formerly efee22d0fb [formerly 2bb8bc22a6] [formerly 9e076f7970 [formerly f8ee84a324b3653a75aa3c63a793eca412e1bd81]]]
Former-commit-id: efee22d0fb [formerly 2bb8bc22a6]
Former-commit-id: efee22d0fb
Former-commit-id: e44794e98b
2015-01-29 14:50:02 -05:00
Steve Harris
676314920e Merge tag 'OB_14.4.1-5m' into omaha_14.4.1
14.4.1-5


Former-commit-id: bc3f196d48 [formerly 1cce5ed9ef [formerly 9927bac8ed] [formerly bc3f196d48 [formerly 6f10c0ebeb8956fd0d12f424ddd9b09bdc4b4021]]]
Former-commit-id: 1cce5ed9ef [formerly 9927bac8ed]
Former-commit-id: 1cce5ed9ef
Former-commit-id: 94c54c32b1
2015-01-28 12:57:55 -06:00
Ana Rivera
2a3bb0c580 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: 20ad0a65f3 [formerly 4071b58b85 [formerly 8bfa7c4087] [formerly 20ad0a65f3 [formerly 291d66c66af4f1f4d298185412d5930714ffb2c5]]]
Former-commit-id: 4071b58b85 [formerly 8bfa7c4087]
Former-commit-id: 4071b58b85
Former-commit-id: ed61c52ee3
2015-01-27 22:05:59 +00:00
Steve Harris
3e5313c7da Merge branch 'master_14.4.1' (14.4.1-4) into omaha_14.4.1
Former-commit-id: 82f2a146da [formerly 0ac687b980 [formerly 1891ed5e5b] [formerly 82f2a146da [formerly cfd0a31a17fc4a92af6db3f034d46b01996d2cc0]]]
Former-commit-id: 0ac687b980 [formerly 1891ed5e5b]
Former-commit-id: 0ac687b980
Former-commit-id: 70b40e76fb
2015-01-27 11:34:06 -06:00
Fay.Liang
0d6808d346 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 65d91d9113 [formerly d29d86ad05] [formerly 7bc10075e5 [formerly 6ad30059fa7249aba100a39c7c39215212a929cc]]]
Former-commit-id: 65d91d9113 [formerly d29d86ad05]
Former-commit-id: 65d91d9113
Former-commit-id: 745ddd63c0
2015-01-27 12:08:28 -05:00
Ana Rivera
6b58d62fe3 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: 327945af8b [formerly 62094315d2 [formerly 7c5fc26537] [formerly 327945af8b [formerly 889608360567b829f81ed6392c64c669798f34a9]]]
Former-commit-id: 62094315d2 [formerly 7c5fc26537]
Former-commit-id: 62094315d2
Former-commit-id: dd232580d0
2015-01-27 16:28:42 +00:00
Ron Anderson
06c5303425 Merge "Omaha #4033 Fix logging in configureTextProducts" into omaha_14.4.1
Former-commit-id: 3a804c4be7 [formerly 178ad50f20 [formerly d97b54018c] [formerly 3a804c4be7 [formerly aa7900e79f0ce9074c32ad0785dd9d0ccbfa64ba]]]
Former-commit-id: 178ad50f20 [formerly d97b54018c]
Former-commit-id: 178ad50f20
Former-commit-id: f6c2df4507
2015-01-27 08:59:12 -06:00
Ron Anderson
d7ec359c88 Omaha #4033 Fix logging in configureTextProducts
Change-Id: I1d2de04b532a3d543418d42c76e499cde2c04030

Former-commit-id: 29930e52b3 [formerly 0dc17a57a2 [formerly 13bfa6e362] [formerly 29930e52b3 [formerly 1c1fefe7cc5cf26abf7c60254132ddeb22585b26]]]
Former-commit-id: 0dc17a57a2 [formerly 13bfa6e362]
Former-commit-id: 0dc17a57a2
Former-commit-id: 24c51738d6
2015-01-26 17:50:28 -06:00
Ana Rivera
2b6dc12727 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 654d08a588 [formerly 98ac97e397] [formerly 7c25945fd9 [formerly 51ef304bd94fd003a1e7349a22c41e21b340ac8a]]]
Former-commit-id: 654d08a588 [formerly 98ac97e397]
Former-commit-id: 654d08a588
Former-commit-id: 48cb3fd143
2015-01-26 18:45:26 +00:00
Shawn.Hooper
05471bb434 Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: e84a037b2e [formerly e6c4f29036 [formerly 568b7c801a] [formerly e84a037b2e [formerly 95cdc2d817eac840017fc14746c2ada498f1a716]]]
Former-commit-id: e6c4f29036 [formerly 568b7c801a]
Former-commit-id: e6c4f29036
Former-commit-id: ee48ce9e68
2015-01-26 11:22:49 -05:00
Nate Jensen
707dc5231f Omaha #3952 remove custom gzip handling since it is by default enabled
by apache httpclient

Change-Id: I4a1f05c11228139c8df1d2883b951c8d876f3802

Former-commit-id: c4598baf19 [formerly 7e8d355f62 [formerly 63189329a1] [formerly c4598baf19 [formerly 4f67ebeb092d182ec0a4e5078e668313d8cc6a57]]]
Former-commit-id: 7e8d355f62 [formerly 63189329a1]
Former-commit-id: 7e8d355f62
Former-commit-id: 6de7f4d2c8
2015-01-26 09:10:36 -06:00
Steve Harris
6adf956253 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 8cd9e2e92f [formerly 158fa16376] [formerly 0f05c53a53 [formerly 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79]]]
Former-commit-id: 8cd9e2e92f [formerly 158fa16376]
Former-commit-id: 8cd9e2e92f
Former-commit-id: ea3465f55a
2015-01-23 09:08:06 -06:00
Shawn.Hooper
58afdb2cc2 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 7839dab5e6 [formerly 0bc501bd4c] [formerly a757b55446 [formerly d53c809149da23fcae51138cc45c57aecd641794]]]
Former-commit-id: 7839dab5e6 [formerly 0bc501bd4c]
Former-commit-id: 7839dab5e6
Former-commit-id: eefaa49d44
2015-01-22 16:05:41 -05:00
Dave Hladky
fc9a125f42 Omaha #3918 Central registry web interface broken by DPA fix.
Former-commit-id: a15e67385a [formerly 5fd928ec4c [formerly c1127b066f] [formerly a15e67385a [formerly 5aa305adb5fd16c72ce557309cab28fd287379d9]]]
Former-commit-id: 5fd928ec4c [formerly c1127b066f]
Former-commit-id: 5fd928ec4c
Former-commit-id: 41b0ae02d4
2015-01-22 13:22:18 -06:00
Ana Rivera
8840162b13 VLab Issue #6082 - Patch for BinLightningDecoder.java; fixes #6082
Change-Id: Ide610d8209a7072dbcdc4bb7c26fc85cedc6e24f

Former-commit-id: 18b9d5d163 [formerly 4f8900fd23 [formerly 7b47ffe362] [formerly 18b9d5d163 [formerly 8a66266d3ffa236343f14089d7e7b32c1060f9ea]]]
Former-commit-id: 4f8900fd23 [formerly 7b47ffe362]
Former-commit-id: 4f8900fd23
Former-commit-id: 74d095524e
2015-01-22 16:11:44 +00:00
Nate Jensen
ad8dc7fb2a Omaha #3993 ensure important dataplugin utility folders are included in
viz builds

Change-Id: I3bb2a464f482995943e3729e439c3f0c8fbfe747

Former-commit-id: b434ae1343 [formerly f88f62191f [formerly 05307be9d0] [formerly b434ae1343 [formerly 9f30c7195d6a62206bae05d6e17df4a8e068255e]]]
Former-commit-id: f88f62191f [formerly 05307be9d0]
Former-commit-id: f88f62191f
Former-commit-id: 88e656a34d
2015-01-13 16:47:04 -06:00
Fay.Liang
0fd13d9226 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 1934dedd2d [formerly 13fb781066] [formerly a09a27a963 [formerly 67315d8c5f28f5ed5e0870f65de30a9c2c2bd290]]]
Former-commit-id: 1934dedd2d [formerly 13fb781066]
Former-commit-id: 1934dedd2d
Former-commit-id: 8a6ed4ec3d
2015-01-13 14:35:30 -05:00
Slav Korolev
e2e184d6d3 Omaha #3220 - Replaced MonitoringArea class with individual area configuration managers.
Former-commit-id: b8ab18d3e1 [formerly f08d184cfc [formerly 9c57dab437] [formerly b8ab18d3e1 [formerly 00fd20d76a4ea46e9806bad11b1bc5a2acc42d6e]]]
Former-commit-id: f08d184cfc [formerly 9c57dab437]
Former-commit-id: f08d184cfc
Former-commit-id: ec08386cc4
2015-01-12 14:32:31 -05:00
Fay.Liang
1e3dff2da2 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 6b77894bd0 [formerly c6bd5d7675] [formerly eed6737801 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]]
Former-commit-id: 6b77894bd0 [formerly c6bd5d7675]
Former-commit-id: 6b77894bd0
Former-commit-id: 19a29da5de
2015-01-12 13:03:31 -05:00
Nate Jensen
b8a8b58072 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 c37ffcde90 [formerly 44f0f7aafc] [formerly 06054344dd [formerly 5fc926b7e735f2c92b16a85a7ba5f663a443ea53]]]
Former-commit-id: c37ffcde90 [formerly 44f0f7aafc]
Former-commit-id: c37ffcde90
Former-commit-id: 014c30ad96
2015-01-12 09:22:30 -06:00
Michael Gamazaychikov
d442975fb1 ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable.
Change-Id: Ife5ecb2c5823d4d34c1b4af6dc53fa360074b7bb

Former-commit-id: e007fac30f [formerly 1aa98e754a [formerly bae8d9ea3f] [formerly e007fac30f [formerly 38eabd6196df1576970019f2b0255d3f39a825a9]]]
Former-commit-id: 1aa98e754a [formerly bae8d9ea3f]
Former-commit-id: 1aa98e754a
Former-commit-id: f7661c47dc
2015-01-09 15:07:29 -05:00
Ying-Lian.Shi
6e45ab9a35 ASM #15035 - Add SFMG WNJ GFE Domain definition to baseline serverConfig, double quote to sigle quote
Change-Id: I9c652fdc3440d8c15a0c443a6b80a8a10877693e

Former-commit-id: c99e199a69 [formerly 4109770c59 [formerly 3e1d1aa814] [formerly c99e199a69 [formerly af67fa0f955b35c7b9b141fef507a5db805eaa27]]]
Former-commit-id: 4109770c59 [formerly 3e1d1aa814]
Former-commit-id: 4109770c59
Former-commit-id: b7e616eb6e
2015-01-08 15:28:54 +00:00
Juliya Dynina
5f4733c4f4 Merge "ASM #632 -Filter erroneous RPG alert messages." into asm_14.4.1
Former-commit-id: 2efa96316e [formerly 206a985f23 [formerly d0072cd181] [formerly 2efa96316e [formerly 503e8a59c9608c3094d817e3e2d5e07250c0e0e5]]]
Former-commit-id: 206a985f23 [formerly d0072cd181]
Former-commit-id: 206a985f23
Former-commit-id: 1c7bb3f727
2015-01-07 09:02:32 -05:00
Daniel.Huffman
4790d5cc6b ASM #632 -Filter erroneous RPG alert messages.
Change-Id: Iacab9ba170ac0f267ac7eedeaf81113a687c988e

Former-commit-id: 7a563dd505 [formerly 22f923eaf5 [formerly 9db291b296] [formerly 7a563dd505 [formerly d7d3bc55053f16da410d3ebe1ef055e93d198790]]]
Former-commit-id: 22f923eaf5 [formerly 9db291b296]
Former-commit-id: 22f923eaf5
Former-commit-id: f4ea480d38
2015-01-07 00:41:35 +00:00
Dave Hladky
8ee78747a6 Omaha #3918 Fix for standalone clients not starting due to central registry non-existance.
Change-Id: I78ed5dd75e94d567d934acfae098d59364a62292

Former-commit-id: 36ab95205f [formerly c6aca09cf3 [formerly 66aa4b2fbf] [formerly 36ab95205f [formerly d8a52577bbe13f53f9afbbae354e8bc58e11a0ed]]]
Former-commit-id: c6aca09cf3 [formerly 66aa4b2fbf]
Former-commit-id: c6aca09cf3
Former-commit-id: a223529e47
2015-01-06 14:37:01 -06:00
Brian Clements
27c93f4d87 Omaha #2707 replaced LSR officeId constraint with stationId
Change-Id: I05fef0c56801fa907e45da3400437e71ce0e38dd

Former-commit-id: ac952bc760 [formerly 111c81d35c [formerly acc9e8630d] [formerly ac952bc760 [formerly e0cd69f020d351f0aaefd5b35ffb369e44a04e48]]]
Former-commit-id: 111c81d35c [formerly acc9e8630d]
Former-commit-id: 111c81d35c
Former-commit-id: cbc8c0d72d
2015-01-06 12:33:06 -06:00
Rici.Yu
c6957d656e ASM #16942 - GFE: VTEC Active Tables not getting purged
Change-Id: Ia00f0c5d9f0a9f8abadde271f3608fd4e786a60b

Former-commit-id: 483d0216da [formerly 4d10daca1f [formerly 97c7681e01] [formerly 483d0216da [formerly a98e1f924bf0b99657dd56241c02f529c5e48ce7]]]
Former-commit-id: 4d10daca1f [formerly 97c7681e01]
Former-commit-id: 4d10daca1f
Former-commit-id: 1a73642a1d
2014-12-30 13:56:02 -05:00
Nathan Bowler
9b1b57ca13 Omaha #3600 Implement getAvailableLevels() for radar to increase inventory performance.
Change-Id: I168bd135ae3ddd386761bb87b9160eb97f718642

Former-commit-id: a674630b92 [formerly f7acda4f6a [formerly 863ac95fef] [formerly a674630b92 [formerly 6f9709b43d307494dfa702030b961964ec8d2170]]]
Former-commit-id: f7acda4f6a [formerly 863ac95fef]
Former-commit-id: f7acda4f6a
Former-commit-id: 1f4c329495
2014-12-19 12:56:43 -05:00
Ana Rivera
c536f5c2b9 VLab Issue #5704 - Update NWPS: runManualNWPS_OutsideAWIPS.sh; fixes #5704
Change-Id: I32484682f1eb2bccd286673a1ea15cebd8df9320

Former-commit-id: 77d66167f0 [formerly 3686a4e170 [formerly 57d8d5794d] [formerly 77d66167f0 [formerly b016c3bcb587c04b4d0e5d21ecce6f5e6bb3e75d]]]
Former-commit-id: 3686a4e170 [formerly 57d8d5794d]
Former-commit-id: 3686a4e170
Former-commit-id: c37c7f429b
2014-12-18 14:13:24 +00:00
Kiran.Shrestha
bcc8130e31 ASM #622 Total Precipitable Water (TPW) satellite field should be displayed in inches
Change-Id: Ia7aba807682f559f11522491f7d64280eef9eac0

Former-commit-id: 991f4c22c8 [formerly 897ca1de81 [formerly 8216ea6b6b] [formerly 991f4c22c8 [formerly 039ccf8cf811b9e4f868138da8074df3ea4a862a]]]
Former-commit-id: 897ca1de81 [formerly 8216ea6b6b]
Former-commit-id: 897ca1de81
Former-commit-id: 79845d8507
2014-12-17 21:20:57 +00:00
Juliya Dynina
494bba5df3 Merge "ASM #14638 trigger compare fixed." into asm_14.4.1
Former-commit-id: 9b4ae6de7e [formerly e9d9b1c7bd [formerly aaf04680c4] [formerly 9b4ae6de7e [formerly 61e8a1bf2cd87ac9ee16cb8969ba3d74ba4dd514]]]
Former-commit-id: e9d9b1c7bd [formerly aaf04680c4]
Former-commit-id: e9d9b1c7bd
Former-commit-id: 6ae82c524f
2014-12-17 10:05:42 -05:00
Joshua Watson
d86ee989aa VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667

Former-commit-id: 5aa4748569 [formerly 0c375981e7 [formerly 3f2f7f2f3a] [formerly 5aa4748569 [formerly 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29]]]
Former-commit-id: 0c375981e7 [formerly 3f2f7f2f3a]
Former-commit-id: 0c375981e7
Former-commit-id: cf1882cc44
2014-12-17 08:38:27 -05:00
Daniel.Huffman
69249f925b ASM #14638 trigger compare fixed.
Change-Id: I5dc06e8a509a9eeb2afa0c41b84a64b502f5e012

Former-commit-id: a91ea93823 [formerly f520ff9d71 [formerly 9484ea870e] [formerly a91ea93823 [formerly ba6ed158aa84958ad791f2b83e5f95b0cb302f20]]]
Former-commit-id: f520ff9d71 [formerly 9484ea870e]
Former-commit-id: f520ff9d71
Former-commit-id: 272aa39d85
2014-12-17 06:20:52 +00:00
Ana Rivera
0923ddca17 Merge branch 'omaha_14.4.1' into field_14.4.1. Conflicts resolved: VLab Issue #4129, #5421, #5345.
Conflicts:
	cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
	cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	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: Ic838b8b0499b1022a555915c7264b414d6948895

Former-commit-id: 1823ed3596 [formerly 214be0a93b [formerly 043bc3a8b7] [formerly 1823ed3596 [formerly 111ae763e6becb944e34e262e1d87d2d344236e4]]]
Former-commit-id: 214be0a93b [formerly 043bc3a8b7]
Former-commit-id: 214be0a93b
Former-commit-id: 1f5dd0c92b
2014-12-16 23:39:02 +00:00
Ana Rivera
2087b1c59b VLab Issue #4365 Decode Ensemble Kernel Density MOS (EKDMOS); fixes 4365
Change-Id: I1272721f43ee78b310fcf74227317cf27e8d6b28

Former-commit-id: dcf5dc2173 [formerly 15f81a3bc7 [formerly 2eec9d9557] [formerly dcf5dc2173 [formerly cb236c208fe6489f88144adab3178dccd4a826db]]]
Former-commit-id: 15f81a3bc7 [formerly 2eec9d9557]
Former-commit-id: 15f81a3bc7
Former-commit-id: 4fa0956af3
2014-12-16 16:39:22 +00:00
Zhidong.Hao
4eb4d3309b ASM #647 GFE: Files not getting purged out of /awips2/GFESuite/products/ISC
Change-Id: I656058629e2982a20312fca7f7024db82a8ad2fb

Former-commit-id: c3b623cb6d [formerly 9ab6bab9cf [formerly e443ced7f1] [formerly c3b623cb6d [formerly 133d3f229145c8ac84f31a8a6becc98688d189ae]]]
Former-commit-id: 9ab6bab9cf [formerly e443ced7f1]
Former-commit-id: 9ab6bab9cf
Former-commit-id: b3980efbff
2014-12-16 10:16:35 -05:00
Juliya Dynina
ea27510ca3 Merge "ASM #16736 - OHD's RunReportAlarm Service does not notify EDEX's AlarmAlertNotification Observer." into asm_14.4.1
Former-commit-id: 88fbcaa849 [formerly b67ff1b062 [formerly 6b93d792f0] [formerly 88fbcaa849 [formerly 45ad574592e05ba3f9a0f27b2afd2c9a0e5d19a2]]]
Former-commit-id: b67ff1b062 [formerly 6b93d792f0]
Former-commit-id: b67ff1b062
Former-commit-id: fbf33bdd40
2014-12-15 12:25:14 -05:00
Michael Gamazaychikov
21def0bf96 ASM #16736 - OHD's RunReportAlarm Service does not notify EDEX's AlarmAlertNotification Observer.
Change-Id: I74ff5b0abb7df0434bb7f66db080447a9d644266

Former-commit-id: ce2c685da4 [formerly a2dfa180f3 [formerly 4fbd55ebc0] [formerly ce2c685da4 [formerly 5c31d213c84dfa701eda80712ad5014bf4a012aa]]]
Former-commit-id: a2dfa180f3 [formerly 4fbd55ebc0]
Former-commit-id: a2dfa180f3
Former-commit-id: fc73fa09c7
2014-12-15 08:40:22 -05:00
Jordan Gerth
27bcfce660 VLab Issue #5345 - Ingest, Load, Display severe probability for a storm cell
Change-Id: I032b0db29ed8947df3fe630336bb01083dbfecd0

Former-commit-id: e0fd068337 [formerly 4003c09e47 [formerly 784c43ee33] [formerly e0fd068337 [formerly fe7454aac732eae6bd0024be122b819e909f98fa]]]
Former-commit-id: 4003c09e47 [formerly 784c43ee33]
Former-commit-id: 4003c09e47
Former-commit-id: 39f9c87fa3
2014-12-14 15:40:19 -06:00
Richard Peter
6579b4ab6d Merge tag 'OB_14.3.2-8m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java

Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5

Former-commit-id: 8de1ebcb65 [formerly 23eafaba3d [formerly 2457d0e6f7] [formerly 8de1ebcb65 [formerly e190a710b1b9506c99120fdaa1ebfdb144fcbf6f]]]
Former-commit-id: 23eafaba3d [formerly 2457d0e6f7]
Former-commit-id: 23eafaba3d
Former-commit-id: 20fa07c6d3
2014-12-12 10:36:04 -06:00
Ana Rivera
69fa890c43 Merge "VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129" into field_14.4.1
Former-commit-id: 062d78a6e8 [formerly b9fe58ea8b [formerly 41c487a291] [formerly 062d78a6e8 [formerly 3934ea2d8dc5507899ee6942e327c7c5d8eb28cf]]]
Former-commit-id: b9fe58ea8b [formerly 41c487a291]
Former-commit-id: b9fe58ea8b
Former-commit-id: 36b70efaa7
2014-12-12 15:42:39 +00:00
Joshua Watson
85d67b46ce VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840

Former-commit-id: bca4b40eed [formerly 0c8b629c96 [formerly a8f5bb480b] [formerly bca4b40eed [formerly cfce2a5f633a7312b9ad64dafb559c834b0ceddf]]]
Former-commit-id: 0c8b629c96 [formerly a8f5bb480b]
Former-commit-id: 0c8b629c96
Former-commit-id: 0d02d676b4
2014-12-11 11:39:00 -05:00
Ana Rivera
f0696f8e9a Merge "VLab Issue #5240 - Baseline LMA; fixes #5240 Made changes suggested by Ben S. Made other changes suggested by Ben S. Made changes suggested by Richard Peter. Made change from Ben S. Change-Id: Ic7eb146c30d8024b34782187318e79882fc963bd" into field_14.4.1
Former-commit-id: d441204ed5 [formerly 0cfdd055bf [formerly 9c63026bfe] [formerly d441204ed5 [formerly 3bf75dd1a19473014b39b7c50dc3936e6fb2b891]]]
Former-commit-id: 0cfdd055bf [formerly 9c63026bfe]
Former-commit-id: 0cfdd055bf
Former-commit-id: 035f9f5cfd
2014-12-11 16:38:06 +00:00
Jingtao Deng
6d59f8496a VLab Issue #5062 - DR17605 Hydro Alert/Alarm mismatched report format between A1 and A2; fixes #5062
Change-Id: Ie5d29a5f2d375d473fe79b990019f757b20ad0bc

Former-commit-id: 831dbd1db6 [formerly a5041af702 [formerly fdd49db3c5] [formerly 831dbd1db6 [formerly ae2c45f9cd0ee5ecb8278ec99cb145525b2ce3a3]]]
Former-commit-id: a5041af702 [formerly fdd49db3c5]
Former-commit-id: a5041af702
Former-commit-id: 3feb633573
2014-12-11 11:14:52 -05:00