Nate Jensen
a86ed5386d
Merge "Omaha #3356 fix ingestGrib level factory initialization order" into omaha_14.4.1
...
Former-commit-id: d6b05aa608
[formerly 5470de5efc2969ef47b177716bc3b2b72662b27c]
Former-commit-id: 1716c4e3dc
2014-09-16 14:07:49 -05:00
Nate Jensen
877aab446c
Omaha #3356 fix ingestGrib level factory initialization order
...
Change-Id: Iaad6d7aa9999f8387ed32806c655e5dee7e6a985
Former-commit-id: b89781c419
[formerly 0ed8b10495a08f1f120cfb3ed4e99e011e3db5a2]
Former-commit-id: b516c4b8c8
2014-09-16 13:24:46 -05:00
Ron Anderson
7a5f911ae2
Issue #3592 Significantly reworked SampleSetManager and sample set dialogs to better match A1 behavior.
...
Change-Id: I8aef618a5091ee7acae470f5729add3c44287f30
Former-commit-id: 19bd85af5e
[formerly bb859073c6ab56141434b84dc104857759a81d82]
Former-commit-id: 5c7290bf7c
2014-09-16 13:20:40 -05:00
Mark Peters
469a54f9fc
Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin
...
Change-Id: Ia10af38c4dd103b304a6d7b23d072023b2bf05b8
Former-commit-id: d3620ffea7
[formerly 27ec90f83560909acdb27893528e28e3dd58fd6b]
Former-commit-id: 47598b6967
2014-09-16 12:13:33 -05:00
Richard Peter
1368d52348
Merge "Omaha #3622 Fix site actiavtion completion message to wait until all JVMs are done" into omaha_14.4.1
...
Former-commit-id: 01d33b408c
[formerly 86993ed870a523bf7b595e6db9ed74e1d0f18d13]
Former-commit-id: 28ac00b003
2014-09-16 10:07:14 -05:00
Ana Rivera
ae6d0f5d64
Merge "VLab Issue #4723 - Ingest LambertConformal projection with two standard parallels using RegionalSat; fixes #4723 " into field_14.3.1
...
Former-commit-id: 536140f021
[formerly c7c530f99f8585817544db2d7be5b13d47c3e62e]
Former-commit-id: 2e66ced748
2014-09-16 08:05:51 -04:00
Steve Harris
eb0a05ab81
Merge branch 'master_14.3.1' (14.3.1-17) into omaha_14.3.1
...
Former-commit-id: 57f0a992d9
[formerly 74d4b836dd8b2eb9a70cf772127d9b7eee23c1bf]
Former-commit-id: d5c0049ba2
2014-09-15 21:13:56 -05:00
Jordan Gerth
898b371293
VLab Issue #4487 - Dim. DR 17313, Additional true color capabilities; fixes #4487
...
Change-Id: I701f302aa5958e89522208fd7915f5077cf97616
Former-commit-id: 8f5903920c
[formerly 1300009502bafd34fee13c8d21d65208b1069bda]
Former-commit-id: 86b34a2f70
2014-09-15 19:14:13 -05:00
Jordan Gerth
478c9db8d3
VLab Issue #4723 - Ingest LambertConformal projection with two standard parallels using RegionalSat; fixes #4723
...
Change-Id: I20b309f4e994259a54e6bdb2276bc09a6b60a885
Former-commit-id: 0b425f94eb
[formerly baf75c177b595dcfb545436586c31d28080b8281]
Former-commit-id: d6eb692733
2014-09-15 16:30:22 -05:00
Xuezhi.Wei
0933440c37
ASM #648 fix for the top of the hour issue for hourlypp
...
Change-Id: I794837427ee6f8dbc615cbd010aeb662ccad9896
Former-commit-id: bca2affc40
[formerly 2d36b1b9ed31404ca9c9a4ecfdbf5f1e40c05b54]
Former-commit-id: 42719b2d5b
2014-09-15 18:14:54 +00:00
Ron Anderson
69789ef17b
Omaha #3622 Fix site actiavtion completion message to wait until all JVMs are done
...
Change-Id: I5130a548bc8ed28e507ded8ef555ae9e966ec3e2
Former-commit-id: 073435a715
[formerly 5a4a1a9a377f11b78ce7a477f205d47c3d763edd]
Former-commit-id: 6a8c82891a
2014-09-15 12:24:39 -05:00
Stephen Gilbert
e7d21b0293
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
...
Former-commit-id: 440bddda4b
[formerly 2cf0da849d50a31d2ca54efeaf6e0258f33ff1d3]
Former-commit-id: 5bf2ed644a
2014-09-15 13:20:34 -04:00
Brian.Dyke
54b26b3616
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 1541e4c255
[formerly 8e4f6e96f7b70d6f2b7517f3f0695350506169c7]
Former-commit-id: 216f34fb25
2014-09-15 10:46:25 -04:00
Brian Clements
1d06a876d7
Omaha #3583 productsrv no longer uses serialization util for JAXB
...
Change-Id: Ifad0e3cc6c875e66e695f7f812b038105ec64b18
Former-commit-id: 8bf3b0372b
[formerly e3dbeb01aa3235db1f6e72a41bdbcd456a60f37f]
Former-commit-id: b984f9e3ed
2014-09-12 15:22:48 -05:00
Mark Peters
9045bb4df8
Omaha #3580 Replace or remove Text Workstation calls to SerializationUtil's JAXB support
...
Change-Id: Id12d02ebf40cd7c7a1236d88a3776b6a3ee1df3c
Former-commit-id: b8dc6d37d8
[formerly 4d5b0516d227eb7b892850753c6bb94f67f01a2d]
Former-commit-id: 004bc1692a
2014-09-12 13:23:40 -05:00
Mark Peters
5abd331ae3
Omaha #3582 Clean up SerializationUtil's JAXB/XML support
...
Change-Id: Ic334e43ff0ddb2556f79b04e32a3daeed478f431
Former-commit-id: b34220fca5
[formerly fcb1a5c9c93ffe19f9a4e3706f68fab12a0649dc]
Former-commit-id: 63f44c571d
2014-09-12 11:46:40 -05:00
Nate Jensen
85119e5610
Omaha #3356 ensure LevelFactory is initialized on edex before GFE startup
...
Change-Id: I889b85404fc361dc92ae4323fb20ab44ff12a166
Former-commit-id: cbe3d885a2
[formerly 64f5c249ed837f854db743e1b90f2194c01cdbfd]
Former-commit-id: 0bde7e01fb
2014-09-12 09:14:01 -05:00
Richard Peter
8f912115ac
Merge "Omaha #3615 Register 2D metar fields" into omaha_14.4.1
...
Former-commit-id: dad8f4c869
[formerly bb317434e32d73c2f1caa2bc335a117be17a2d07]
Former-commit-id: dbd3cd85d6
2014-09-11 11:20:43 -05:00
Mark Peters
cbb5715b34
Omaha #3548 PluginDataObjectFilter fails to start in spring
...
Change-Id: I6db18d15b5a35a081de48a885e3d27495b44b5d0
Former-commit-id: fb33786001
[formerly e9d50c287b6327ea03437a98fb1077b904daeecd]
Former-commit-id: d671d1f432
2014-09-11 10:32:11 -05:00
Nathan Bowler
7ae1ebfd24
Omaha #3615 Register 2D metar fields
...
Change-Id: Ic6cfcbfd1fcbab921732366c8803d54ea493845a
Former-commit-id: ab09b948a6
[formerly 3101fdbde5e8023fdc33ff18ad25c9a8c830693a]
Former-commit-id: ede0cbf395
2014-09-11 11:20:40 -04:00
Stephen Gilbert
2406f0786f
Merge branch 'ncep_14.2.1-n' into ncep_14.3.1
...
Conflicts:
cave/build/cave/customTargets.xml
edexOsgi/build.edex/opt/db/ddl/ncep/loadVors.sql
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ActivityUtil.py
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach1min.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach3hr.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcKp.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcUtil.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/request/DatabaseUtil.java
ncep/gov.noaa.nws.ncep.edex.common/src/gov/noaa/nws/ncep/edex/common/sounding/NcSoundingLayer.java
ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/baseScript-1
ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/test_script
ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/util/AwwParser.java
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-request.xml
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/TrigKCalculation.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/dbutil/NctextDbQuery.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/NsharpConstants.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpDataPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNative.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNativeConstants.java
ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000.xslt
ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000_hires.xslt
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/ContoursAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/contours/Contours.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/RetrieveActivityDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/StoreActivityDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/DisplayElementFactory.java
ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/ui/HILORelativeMinAndMaxLocator.java
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP6HR/SHIP6HR.xml
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcgridResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCGM.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCharacterHeight.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCircleElement.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCommand.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcFillColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcInteriorStyle.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineWidth.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolygonElement.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolyline.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcText.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextAlignment.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextFontIndex.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/ImageBuilder.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/NtransResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/EditPlotModelComposite.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/NcPlotResource2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/Tracer.java
ncep/gov.noaa.nws.ncep.viz.ui.remotescript/build.properties
Change-Id: I8559c4f5f35be8df6fdc4d1467c5f9ccff08ffb6
Former-commit-id: 662436c2d5
[formerly 3775b0762b9d8529f5aa6630480d82e7ea62c1d8]
Former-commit-id: 561b751e58
2014-09-11 11:14:33 -04:00
Richard Peter
bec987b601
Merge "Omaha #3356 updates for improved level lookup" into omaha_14.4.1
...
Former-commit-id: 0608175d2d
[formerly 74f89af8dda533b6b905c86be1afac3e2633923b]
Former-commit-id: 49949b99c5
2014-09-10 14:32:32 -05:00
Ron Anderson
57a3542038
Issue #3592 Fixed several localization issue in GFE
...
Change-Id: I2e65649d490372b5c1738f07c79b5ed15885f8c7
Former-commit-id: b91141ef7b
[formerly a5ef55df33009948fec139e7729dd53ae4251667]
Former-commit-id: 52e5636261
2014-09-09 16:10:53 -05:00
Mark Peters
203e21b807
Omaha #3548 PluginDataObjectFilter fails to start in spring
...
Change-Id: Ia69c93c5bab1c730c3c4bad6781823f989bc1641
Former-commit-id: 735cafee83
[formerly 4d059172e0d822a2fb740d602265da6a91e15ccc]
Former-commit-id: 685a9b1960
2014-09-09 16:09:04 -05:00
Nate Jensen
1c77f66608
Omaha #3356 updates for improved level lookup
...
Change-Id: I32ca44114fb18770bff22c6d0c9173e8fa49a362
Former-commit-id: 62b84b2fb3
[formerly 0ca90b58d7ca85d5bfc8fc525415115ac8451c5b]
Former-commit-id: ae9cffaaea
2014-09-09 15:38:53 -05:00
Brian.Dyke
fe85eb9f70
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
Former-commit-id: 01dfe503f5
[formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]
Former-commit-id: 3d9a3de6e4
2014-09-09 11:44:30 -04:00
Nate Jensen
644c0acbfe
Merge "Omaha #3356 more removal of unnecessary register buddies" into omaha_14.4.1
...
Former-commit-id: 7920053e2f
[formerly 90e8451dd089de67278368ca665da0cfc5bb6740]
Former-commit-id: 986a03c7c5
2014-09-09 09:23:28 -05:00
Brian Clements
06e4c1e644
Omaha #3570 http client API changes
...
Change-Id: Icb6dc44e7841961da3df383e879acf4ef8f1a14f
Former-commit-id: 21ded3ea69
[formerly d4edd51d41a306010a7fec2a7ed2c0cd6186506a]
Former-commit-id: 8489ce1214
2014-09-09 08:47:32 -05:00
Nate Jensen
606642b99f
Omaha #3356 more removal of unnecessary register buddies
...
Change-Id: Ic91c2d5ab93bb220a69be23c54640edae26302a3
Former-commit-id: b46f23d01b
[formerly 39bfb8fd0548c74ed9a4e95b914e90ab2f6ad526]
Former-commit-id: 26e2ff44a4
2014-09-08 17:18:22 -05:00
Nate Jensen
4398f2d7d8
Merge "Omaha #2926 switched text subscription to thrift client" into omaha_14.4.1
...
Former-commit-id: 88e11a4909
[formerly 51c60cf39cc950771597ff652c0e683c73812d91]
Former-commit-id: da3e7dbf72
2014-09-08 13:58:02 -05:00
Brian.Dyke
5415a4939a
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
Former-commit-id: af477df90e
[formerly 7b49ea6d9c45c0624017bbe7ffb1297a402ee875]
Former-commit-id: 858b91d677
2014-09-08 14:54:16 -04:00
Brian Clements
e95a139900
Omaha #3518 each JVM gets a unique user prefs folder
...
Change-Id: I3ea2cf98836bb3a5447b307eda4a5ab235b18619
Former-commit-id: a0d663530b
[formerly 856b223352b99e3f96df6dab84aea313885b3c37]
Former-commit-id: 2c1cd559b6
2014-09-08 13:16:13 -05:00
Matthew Howard
8e65a175fc
Merge "ASM #539 Multiple flag functionality for textdb is not working properly" into asm_14.3.1
...
Former-commit-id: fdfe97c659
[formerly 764e268bcccec4a805509a11fbd9c9f4e1860842]
Former-commit-id: 8ebfa3edce
2014-09-08 08:23:57 -05:00
Brian Clements
d8b2da2900
Omaha #2926 switched text subscription to thrift client
...
Change-Id: I3fafee2252aff2a80657cdf8a8092f63459671c6
Former-commit-id: 0087580736
[formerly 410ef2954d6cfff11a4718056983ccaecf186fd3]
Former-commit-id: ac811b666c
2014-09-05 16:52:38 -05:00
Brian Clements
c89a74943e
Omaha #2926 moved TextDBRequest to common
...
Change-Id: I8f18b6e24d1c27feb5713d4c4f80341fd5d0b67c
Former-commit-id: c77b4f4e8b
[formerly 924e512c327c838d866b353ec8da8f7e5534db49]
Former-commit-id: 1b248efb54
2014-09-05 12:56:04 -05:00
Baoyu Yin
11f1e39b07
VLab Issue #4624 - AWIPS2_DR_17545 Volume Browser MMP units are wrong ; fixes #4624
...
Change-Id: I407cf142f9adfc7601b14e12e33223cf344b596c
Former-commit-id: 7f317934ac
[formerly 0eb76fb764113196683d8ae771d7cf37ccc86495]
Former-commit-id: 2c4a9fbe7c
2014-09-05 13:35:07 -04:00
Brian.Dyke
4220590613
Merge branch 'master_14.2.3' into master_14.2.4
...
Former-commit-id: 702dd65aa7
[formerly 876c6fc4db3901fdcd8dd9a6fb343d2f65254569]
Former-commit-id: 9e1ee22146
2014-09-05 11:13:12 -04:00
Brian.Dyke
cdd1e08ee3
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
...
Former-commit-id: 9f7fabb002
[formerly c1f870d9df7579741e5a1d79cdec77293115e968]
Former-commit-id: d7407481ef
2014-09-05 10:57:14 -04:00
Ana Rivera
c77e5412a6
VLab Issue #4601 - Update to SMS DR #16720 ; Remove HRRR entries in master_grib2_lookup.txt; fixes #4601
...
Change-Id: I0dfe0991503e6d87ce2db9713bb016d68cd1c152
Former-commit-id: a8b04b8e63
[formerly 084970f8445dbb6b76bbad84b5dc986d961d2383]
Former-commit-id: 6d48576930
2014-09-05 13:27:29 +00:00
Greg Armendariz
e8a75882ee
Omaha #3545 - Add log and fail message when directories are missing
...
Former-commit-id: a5359e4547
[formerly 05d45b0c005ce7c8cca51c367754e7e6bca6c085]
Former-commit-id: 0a988d64e4
2014-09-04 11:52:13 -05:00
Brian.Dyke
fa6b302ab6
Merge branch 'master_14.2.2' into master_14.2.3
...
Former-commit-id: d695dd0084
[formerly 3385f2bc24dfb42e82f9e3451cd44da8dfb89e9a]
Former-commit-id: 043a95d35e
2014-09-03 21:14:27 -04:00
Brian.Dyke
3ddb5831a0
ASM #15697 - Fix Hydro Perspective Issue
...
Former-commit-id: cfe03adff6
[formerly 82d7bbe6bf005e543e1ad6772c6a18024f1b0764]
Former-commit-id: 121a2d100f
2014-09-03 21:10:16 -04:00
Nate Jensen
d977dbfcb0
Merge "Omaha #3170 add data times to ffmp geometries being returned, also aggregate data as it is more useful that way" into omaha_14.4.1
...
Former-commit-id: 3a2558eac8
[formerly fbc9b64a0c0734e46ec9db10e0760aa8f2b27c24]
Former-commit-id: 1fd0ed2de6
2014-09-03 17:13:06 -05:00
Steve Harris
0ea6b72088
Merge branch 'master_14.2.4' (14.2.4-7) into omaha_14.2.4
...
Former-commit-id: afa45bf919
[formerly 2391bc928e8798f022c3ca5ad8a1d5619ae4e2a4]
Former-commit-id: 0e869fa6c1
2014-09-03 15:22:00 -05:00
Matt Nash
90b0619656
Omaha #3170 add data times to ffmp geometries being returned, also aggregate data as it is more useful that way
...
Former-commit-id: 980d7bf5ad
[formerly dd691896f03ba16d683a284a26b8ef923e364834]
Former-commit-id: 118d811eee
2014-09-03 14:11:15 -05:00
Stephen Gilbert
4abe38b3ac
VLab Issue #4001 - NCEP EDEX and EDEX Common delivery for 14.2.1-n
...
AWW and Upper Air updates. Revert some RTS xml files
Change-Id: I4cc48defcea33b9008c9734c1c53a193d0ce94da
Former-commit-id: 75277cb034
[formerly 72fa8af848f1452a517a62c6a54eae265a9ec8a1]
Former-commit-id: 32dffe58c8
2014-09-03 14:33:37 -04:00
Richard Peter
1c05f1b459
Merge "Issue #3560 Registry objects not re-sent after fully sync" into omaha_14.2.4
...
Former-commit-id: af87813ea9
[formerly 5f9298d52d0a11775588ed3742f2c2d3f19da1d0]
Former-commit-id: 3de26efce6
2014-09-03 09:42:34 -05:00
Nate Jensen
a0830d06d5
Merge "Omaha #3548 PluginDataObjectFilter fails to start in spring" into omaha_14.4.1
...
Former-commit-id: 80cc58cf25
[formerly e393e1f0455d466edde925608b6f0f1e35351141]
Former-commit-id: 5b80aadbac
2014-09-03 09:21:28 -05:00
Nate Jensen
a690b853bb
Merge "Issue #3572 Fixed getNumpy errors for Grid2DFloat" into omaha_14.2.4
...
Former-commit-id: c23071f48c
[formerly 9e0f31fc6601a39938deeaf7e1c8ed8849e43288]
Former-commit-id: 0f35426ad0
2014-09-02 17:34:59 -05:00
Brian.Dyke
9e156775e5
Merge branch 'master_14.2.3' into master_14.2.4 CM-MERGE:14.2.3-1 (14.2.2-30,-31) into 14.2.4
...
Former-commit-id: 14e64881a1
[formerly bc9f03426304e3bb194fbf7f356d8dd3816cd836]
Former-commit-id: fd8ad016ef
2014-09-02 16:32:54 -04:00