Steve Harris
e1106f77eb
Merge tag 'OB_14.3.1-33m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
Former-commit-id: 9c77ee7c19b87501983acf88279205644e1692f2
2014-11-17 14:31:43 -06:00
Lee Venable
f198da3f4d
Merge "Omaha #3741 - Updated procedures for calculation of a center for zone and station." into omaha_14.4.1
...
Former-commit-id: b6d35ac4e3aa430de7057a16f9d5516584833150
2014-11-14 11:14:16 -06:00
Mark Peters
a3725b43bc
Omaha #3760 Moved to grid the remainder of derived parameters with no other explicit references
...
Change-Id: Ifb12010b4527c18b4e498b5de5757bb74634b496
Former-commit-id: fa93950435431248bd5790788e3a6936b4f4de2b
2014-11-13 13:34:42 -06:00
Lee Venable
6b127b488d
Merge "Issue #3026 - fixes to data access for HPE label generation" into omaha_14.3.1
...
Former-commit-id: 389c35bce7c456154321605c3415c43431a46c7b
2014-11-13 09:31:57 -06:00
Mike Duff
8503cc25a7
Issue #3026 - fixes to data access for HPE label generation
...
Former-commit-id: 8d30af1c970cca70fe74560d3157e754e1164785
2014-11-12 18:34:32 -06:00
Ben Steffensmeier
11966fc0de
Omaha #3805 Increase time of cluster lock, cleanup statictopo plugin.
...
Former-commit-id: 9bbd3f9f8dea46b14d77b796d0ea00285628ea75
2014-11-12 12:50:17 -06:00
Ron Anderson
a60e3465f4
Issue #2854 Fix merge issue in MessageProducer between DRs 2726 and 3684
...
Change-Id: I6a6ea9c57857459f61e955a54275a8983a8004ce
Former-commit-id: 09f13d9b33cfe3547d2dc3fb75c1673e1f3193b0
2014-11-12 11:25:32 -06:00
Mark Peters
9498a60e7b
Omaha #3760 Moved derived parameters with radarVWP model to radar plugin
...
Change-Id: I57e6d8177eb483e14154b4bf0a1d86b71f40655f
Former-commit-id: e156d9527a0dd5fb25aca0264f1fddf546e60acf
2014-11-11 17:16:51 -06:00
Nate Jensen
f1c0b33254
Merge "Omaha #3760 Moved derived parameters with grid models to grid plugin" into omaha_14.4.1
...
Former-commit-id: c2d32105c4cd1e7acb52b84ba23d119720888c96
2014-11-11 17:09:08 -06:00
Mark Peters
805bc7c7bc
Omaha #3760 Moved derived parameters with grid models to grid plugin
...
Change-Id: I7ac459804b50872203103eb0e2b8a833aa1015ba
Former-commit-id: 314e0cd90be176af62c452d44ea53587a2408c5d
2014-11-11 15:21:02 -06:00
Slav Korolev
a873fe7b5c
Omaha #3741 - Updated procedures for calculation of a center for zone and station.
...
Former-commit-id: a34a8901f83457fa21fc99a0f2ff0df956487b62
2014-11-11 14:56:21 -05:00
Nate Jensen
9d52d4eb5c
Omaha #3549 improve logging of findDataTime errors
...
Change-Id: Ie1af1aac1750ebc42257d3dd3e448bb95801cceb
Former-commit-id: 7a1dd6c72261fb0c1118cea226b5c31c8225b1c7
2014-11-11 09:54:18 -06:00
Nate Jensen
a3366c9417
Merge "Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30." into omaha_14.4.1
...
Former-commit-id: 8f7fa6b23c7a20b15c5f9bdfdac5add17aab336e
2014-11-11 09:11:18 -06:00
Nate Jensen
13645f54d4
Merge "Omaha #3760 Move appropriate derived parameters to bufrmos, bufrua, lsr" into omaha_14.4.1
...
Former-commit-id: ea80beca2d0da38d31e0fde21414c7b481c8f61d
2014-11-10 11:19:40 -06:00
Nate Jensen
1a59453949
Merge "Omaha #3760 Move derived parameter definitions to grid plugin" into omaha_14.4.1
...
Former-commit-id: c9856a64e466695be51903d88ba9f87b0286b19b
2014-11-10 11:17:16 -06:00
Steve Harris
a16abe1b8b
Merge tag 'OB_14.3.1-32m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/build.edex/esb/conf/logback-ingest.xml
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/IMessageProducer.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
Former-commit-id: 565efec2ebe5a3a1a009d213a77617f4a593aa6b
2014-11-10 08:42:01 -06:00
David Lovely
625e83c445
Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30.
...
Change-Id: Ib28bf8e2edb3b299a7122bac7c80f302780b7470
Former-commit-id: 3addb3007b0bf7aab88b423bbf700583fc2b3e48
2014-11-10 08:27:28 -06:00
Mark Peters
131ee29479
Omaha #3760 Move derived parameter definitions to grid plugin
...
Change-Id: I760f2a61e270c38e92c4321489d2b2220d55129b
Former-commit-id: 4c8316b98529d111b24ca7fdfd10d62ba6058148
2014-11-07 16:56:22 -06:00
Mark Peters
724cb2e7d2
Omaha #3760 Move appropriate derived parameters to bufrmos, bufrua, lsr
...
Change-Id: Ic8f3675e7d50cc4b5803bb2c6991ef860afa4dd8
Former-commit-id: 06fed9a6d76c59c77e12fec2789707e46df44817
2014-11-07 16:17:24 -06:00
Mark Peters
80454c815d
Omaha #3760 Derived parameter definitons for ldadhydro and obs split to appropriate plugins
...
Change-Id: I61d7553d300a173bb64d09898c76c23a0ef94241
Former-commit-id: dc5f62b485b32bea22d9886e22fe053163aff19a
2014-11-07 14:05:04 -06:00
Mark Peters
2ee1a9b31f
Omaha #3760 Derived parameter definitions should be split to appropriate plugins
...
Change-Id: I9dfd7623b778e64982dd2de6f00d944c90401611
Former-commit-id: d4da6be1b1972df984ea1fb3eb1c5476af5d4cfa
2014-11-07 12:09:04 -06:00
Richard Peter
9047da36ae
Merge "Omaha #3788 Switch satellite_spatial.gid to a sequence." into omaha_14.4.1
...
Former-commit-id: 4b78380f15df6a8d9a35eb7a2b976b982e949243
2014-11-07 11:18:54 -06:00
Ben Steffensmeier
5d40da982a
Omaha #3788 Switch satellite_spatial.gid to a sequence.
...
Former-commit-id: 919f4ca671ca953b881037e4a69d720d3bf79eb5
2014-11-07 10:23:39 -06:00
Richard Peter
b92033924b
Merge "Omaha #3353 Fix deadlock that freezes cave." into omaha_14.4.1
...
Former-commit-id: 24f3f08d27ac6d3e2cba7b5f6f5a3fd8e6452700
2014-11-07 09:50:34 -06:00
Dave Hladky
2c61cae7ab
Omaha #3798 Merge Fixes
...
Former-commit-id: 011a9d5b937e1a8a337ffaf04ba47cd7080ffaf5
2014-11-06 12:09:42 -06:00
Brian.Dyke
aae68215c8
Merge branch 'master_14.2.4' into master_14.3.1
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 5c2079dd25181c68f872691e81842aff0f696f8d
2014-11-06 12:55:21 -05:00
Nate Jensen
6560926461
Merge "Omaha #2714 created satellite.gini edex plugin" into omaha_14.4.1
...
Former-commit-id: da81f4d7ceeb5251b69e72cfddde9e59de5a2da1
2014-11-06 11:26:10 -06:00
Brian Clements
db7652f69d
Omaha #2714 created satellite.gini edex plugin
...
moved satellite decoder to new plugin
replaced database table lookups with in-memory tables backed by XML
Change-Id: I45269240964dd3590ec2068472cf0b4f5dd54c60
Former-commit-id: df744611151caf6492f5dc084974140c1a6fae0a
2014-11-06 11:06:19 -06:00
Steve Harris
1a8817803d
Merge branch 'omaha_14.4.1' into omaha_pda
...
Former-commit-id: 3fdd69aade32e40d4684da739b19a414e0ba37df
2014-11-05 07:58:05 -06:00
Roger Ferrel
398a8d6043
Omaha #3353 Fix deadlock that freezes cave.
...
Change-Id: I4afa5c505178f30ada5dd58612b0703ab9529e6b
Former-commit-id: 871fa68ddf242f1e63286939b1324fc3197c7336
2014-11-04 14:13:29 -06:00
Steve Harris
a5398d8035
Merge tag 'OB_14.3.1-31m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java
Former-commit-id: 361f7bcf425edaf687cbfc63d4c165790b45a5bf
2014-11-04 13:17:44 -06:00
Shawn.Hooper
58db54ff05
ASM #15033 - Allow generic warning types to show up continuously during Warning cycle
...
Change-Id: I6e0884b1bbc1e4bed3300bb9dc0f0b3f779aa212
Former-commit-id: 41e18e5104eac8ee3335a80d678d74c7a56b196a
2014-11-03 10:30:05 -05:00
Shawn.Hooper
a44d775a27
ASM #16800 - Add HRRR under D2D in Weather Element Browser
...
Change-Id: I829cd7357ccd37e389e88567a4159d0efde9aa41
Former-commit-id: 99807ddc4810c08635d5462357dc29e661686e33
2014-10-30 14:47:26 -04:00
Nate Jensen
fc9c89c426
Merge "Omaha #3755 Update Grid and Radar information retrieval for msas/laps inventories." into omaha_14.4.1
...
Former-commit-id: e9780b64d0ce8c91f7c236067f5ab251bd874546
2014-10-30 13:41:14 -05:00
Nathan Bowler
f714213db3
Omaha #3755 Update Grid and Radar information retrieval for msas/laps inventories.
...
Change-Id: I472c2948ada9357350138fe27f2588cce27e17ba
Former-commit-id: 2ec9a420268e41d8fdc35efe7feabfb12b7bee4c
2014-10-30 13:18:14 -04:00
Steve Harris
54c14a5f5b
Merge tag 'OB_14.3.1-30m' into omaha_14.4.1
...
Former-commit-id: 9f4fc2a9cbff7f8555c7bf8326bb785f791e8b00
2014-10-30 09:40:20 -05:00
Benjamin Phillippe
fd16871b96
Omaha #3454 Fixed text archiver
...
Former-commit-id: 61514bec505566ba434e3b9772e0aaf329b51cff
2014-10-29 16:09:35 -05:00
Steve Harris
315423d014
Merge branch 'omaha_14.4.1' into omaha_pda
...
Former-commit-id: 38fbd41a54b5dd9afe0482f83ed3b4d7d5a2aa2e
2014-10-29 09:55:14 -05:00
Nate Jensen
13096c2eaa
Merge "Omaha #3720 Remove dataURI column references from redbook" into omaha_14.4.1
...
Former-commit-id: add132c7f2baf5b421590827559b99954133be76
2014-10-28 15:32:55 -05:00
Nate Jensen
bf7d9b31b7
Merge "Omaha #3454 Fixing usage of getSession() to ensure proper session closure" into omaha_14.4.1
...
Former-commit-id: 7306aeaa7986aa69d2c18c00d940fb2eb0624612
2014-10-28 15:32:41 -05:00
Ron Anderson
ee12f5dc65
Merge "Omaha #3685 Fix spell checker to use mixed case. Fix bug in importShapefile" into omaha_14.4.1
...
Former-commit-id: e076201872a69829228a6e78d632287839acf3d8
2014-10-28 15:15:26 -05:00
Ron Anderson
8b32ac8f54
Merge "Omaha #3685 Add support for sending specific products in mixed case" into omaha_14.4.1
...
Former-commit-id: 453e478604f048ae019eeee9bb8e46883b58254e
2014-10-28 15:15:16 -05:00
Brian.Dyke
9907c37a0e
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: d12d6cf7e6862a87c00f833ee02e72e5c0ad8252
2014-10-28 15:25:05 -04:00
Brian.Dyke
f8ce701c85
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
Former-commit-id: 52ba693c7d77f4e29db6bc5202c9764509bce58d
2014-10-28 15:23:11 -04:00
Steve Harris
1b83d045ea
Merge tag 'OB_14.3.1-28m' into omaha_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/AdhocSubscription.java
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/MonitorAreaUtils.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalDao.java
rpms/awips2.core/Installer.gfe.climo/component.spec
Former-commit-id: 353674cd0deec2dd86c38dc75c7593d1477a7e78
2014-10-28 13:32:31 -05:00
Baoyu Yin
c9bc14a668
VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 28 fix for FFW error ; fixes #4796
...
Change-Id: I4f43f1365c3ad4d11314f199c4d896aa542a48c0
Former-commit-id: 54d2f956f53d2fe8a6fa0550a4236d95013b8ba8
2014-10-28 14:32:31 -04:00
Mark Peters
d03a4bd3e7
Omaha #3720 Remove dataURI column references from redbook
...
Change-Id: I81ba779e6e9ded93256c7ccd7b2932ceefbfd51d
Former-commit-id: 48160d952981b597634c941741e2bc370a5fdb5f
2014-10-28 12:21:45 -05:00
Benjamin Phillippe
bbd2081844
Omaha #3454 Fixing usage of getSession() to ensure proper session closure
...
Former-commit-id: fc36b84fa43c354b674f040ae5d2647df5b3122f
2014-10-28 11:30:25 -05:00
Ron Anderson
ebe43e22d3
Issue #3766 Fixed return type of GridParmManager.createNewDb
...
Change-Id: Ib76bf614b09895ef08065da86d3af8d59f490f4c
Former-commit-id: 2e2f83952a6ef00b17d9f4504133c85e93e0126e
2014-10-27 18:40:15 -05:00
Baoyu Yin
2c0c42dcdd
VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 27 ; fixes #4796
...
Change-Id: I636b0cbb46b31f46cb2d017a4b3047108c98f0c9
Former-commit-id: b447742f498bceaf5f522a637d6ae501f80dfa23
2014-10-27 10:15:39 -04:00
