xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1933 commits 31 branches 40 tags 3.8 GiB
Commit graph

79 commits

Author SHA1 Message Date
Roger Ferrel
951e5b237d Issue Code clean up to properly display gird data ignore the added commented out print statement they will go away. 
Change-Id: I7716af97c3a94f2243be1b219ed9f91c7b67c0d8

Former-commit-id: bfb9f9f156 [formerly 2b509cf7de] [formerly e26689a487 [formerly 9ac5a199108a1e1d106a79e67cd6209bd46134cb]]
Former-commit-id: e26689a487
Former-commit-id: e7bae3c272
 2013-02-13 16:45:52 -06:00
Steve Harris
b119d66cda Merge branch '13.2.1_delivery' into development 
Former-commit-id: da43a7a8ca [formerly 4bc8e9ab5c] [formerly 5ee47e098d [formerly 30e1ae8f245a60c780fcc79f54795ece0b28088f]]
Former-commit-id: 5ee47e098d
Former-commit-id: 3ad515e28f
 2013-02-06 11:12:01 -06:00
Steve Harris
48a0ffda4d Merge branch 'ss_builds' (13.2.1-5) into 13.2.1_delivery 
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java

Former-commit-id: 14f23d4227 [formerly a16ac7819c] [formerly 6c6b53679b [formerly 873c1773504d6dd9421b92f6193c32e477e4533c]]
Former-commit-id: 6c6b53679b
Former-commit-id: 28ddc9bad8
 2013-02-06 11:08:53 -06:00
Steve Harris
7497a15e22 13.2.1-5 baseline 
Former-commit-id: a6b3cde1ff [formerly 232734091d] [formerly 146fcc6da8 [formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]]
Former-commit-id: 146fcc6da8
Former-commit-id: 1c602ec3a7
 2013-02-06 11:02:32 -06:00
David Gillingham
3a13421305 Issue : Fix port error in SmartScript.getGridCellSwath(). 
Change-Id: If435423a8277f852b3ceb0a7299332ece800696f

Former-commit-id: 6f6534649a [formerly 292bd811a0] [formerly 49a4e1c39d [formerly 2e2be1d031a93f0fe13c17788eabff34ab428caa]]
Former-commit-id: 49a4e1c39d
Former-commit-id: 62f30014f0
 2013-01-31 12:00:38 -06:00
Steve Harris
73d9455c65 Merge branch '13.2.1_delivery' into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: c218786986 [formerly 658bea377b] [formerly ec56acde81 [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]
Former-commit-id: ec56acde81
Former-commit-id: 6383bf8ed2
 2013-01-31 10:19:14 -06:00
Steve Harris
75f6e61e6f Issue - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery 
Former-commit-id: e655d297f7 [formerly 0505ed0a72] [formerly 6040272573 [formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]
Former-commit-id: 6040272573
Former-commit-id: 513d49939f
 2013-01-29 15:57:21 -06:00
Steve Harris
daca1c3e73 13.2.1-3 baseline 
Former-commit-id: 283147571f [formerly f45120a1f4] [formerly 7a739c6a5b [formerly fc7291332a08966a746605aef725e1947ec9643c]]
Former-commit-id: 7a739c6a5b
Former-commit-id: 3edfa1e0be
 2013-01-29 15:52:43 -06:00
Steve Harris
251a9c0195 13.2.1-2 baseline 
Former-commit-id: 0006a2b6cb [formerly 7a7f7c45ca] [formerly c3e4551dfa [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]
Former-commit-id: c3e4551dfa
Former-commit-id: 1153d80c5b
 2013-01-25 09:07:12 -06:00
Ben Steffensmeier
3dfe43caac Issue fix mod families 
Former-commit-id: 735add55ba [formerly 13fd813660] [formerly a7989d4638 [formerly 76b5a4fcf313e2a028662a1e07871fff2e328d48]]
Former-commit-id: a7989d4638
Former-commit-id: fbd614258f
 2013-01-23 15:47:30 -06:00
Ben Steffensmeier
50d1561165 Issue switch dual pol bundles to no longer use bestRes, fix bestRes updates. 
Former-commit-id: a9654f859a [formerly f0af056d97] [formerly ec199ad7d1 [formerly deeff9eae06f096612b65832a344e5d05a36db07]]
Former-commit-id: ec199ad7d1
Former-commit-id: 3bfba5b771
 2013-01-18 10:59:43 -06:00
David Gillingham
09836dacca Issue : Commit initial implementation of a generic PythonScript controller class based on GFE's AbstractGfePyController, refactor GFE code to use it. 
Change-Id: I6d04b58fea98c6e4ef032b4867969b8a01e258bc

Former-commit-id: 9e3999a427 [formerly c6e64d83a2] [formerly d16760c73e [formerly f54f775fa2bb89663e308feb79f5e188dbdd4cb4]]
Former-commit-id: d16760c73e
Former-commit-id: a40383de3b
 2013-01-17 17:42:05 -06:00
Bryan Kowal
ef232c483f Issue - the com.raytheon.viz.dataaccess feature will now be built 
Former-commit-id: 846d860eb2 [formerly 68491bee01] [formerly 08c2faaabe [formerly 796f9e15632bf3491c68702be5e7135c51b99fec]]
Former-commit-id: 08c2faaabe
Former-commit-id: 7dbe52a47a
 2013-01-17 09:57:58 -06:00
Ben Steffensmeier
0fe033c64c Issue fix mod families 
Former-commit-id: da98f8e176 [formerly 244f55e1f9] [formerly 65b11cf54c [formerly 4678cbf7764cae77683d357f0ac1bf6ff95bc63e]]
Former-commit-id: 65b11cf54c
Former-commit-id: 0d8a901d07
 2013-01-16 10:56:21 -06:00
Lee Venable
c4291fcb2a Merge "Issue switch dual pol bundles to no longer use bestRes, fix bestRes updates." into development 
Former-commit-id: a3c5aded12 [formerly 32692a6def] [formerly f63da5aba6 [formerly 517b6e6652b75801928cbb8f2f6899916e8dd988]]
Former-commit-id: f63da5aba6
Former-commit-id: 5a733e465d
 2013-01-15 14:47:49 -06:00
Richard Peter
79ef100838 Merge branch 'ss_builds' (13.2.1-1) into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: a966546e31 [formerly 3fb7d96ec1] [formerly 1dbb34523b [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]
Former-commit-id: 1dbb34523b
Former-commit-id: 345dfd2ca9
 2013-01-14 18:07:17 -06:00
Ben Steffensmeier
3d63fa24a1 Issue switch dual pol bundles to no longer use bestRes, fix bestRes updates. 
Former-commit-id: da79be73a2 [formerly f49e77f7df] [formerly 2e10a8408b [formerly c0888b1ff6de67da8b4bb7a234bc5dbecafa9009]]
Former-commit-id: 2e10a8408b
Former-commit-id: 0a0d230091
 2013-01-14 17:44:46 -06:00
Steve Harris
e34695538d 13.2.1-1 baseline 
Former-commit-id: 5dfe4d10f1 [formerly e62172c8c7] [formerly 81849e3cbb [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]
Former-commit-id: 81849e3cbb
Former-commit-id: 8713dfc5ca
 2013-01-14 18:42:21 -05:00
Richard Peter
fa6247baf7 Issue : Merge branch 'ss_builds' (13.1.2-8) into development 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java

Former-commit-id: ae3ea75cbf [formerly 1318f53902] [formerly b8e42dabc0 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]
Former-commit-id: b8e42dabc0
Former-commit-id: aa9e16b038
 2013-01-14 17:38:38 -06:00
Steve Harris
f1256f2a9e 13.1.2-7 baseline 
Former-commit-id: a8d90da9c0 [formerly 4f86b07eb0] [formerly 42189b5f88 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]
Former-commit-id: 42189b5f88
Former-commit-id: b7f1dbe72b
 2013-01-11 16:12:09 -05:00
Nate Jensen
ef3468acd4 Merge "Issue - updated the memory settings for 64-bit GFE" into development 
Former-commit-id: d02e1ff0a7 [formerly a3e10f6dcd] [formerly 62f89e6189 [formerly 5f262d2cb46ad8ff0ec355e64ee73b6deb7ed454]]
Former-commit-id: 62f89e6189
Former-commit-id: 5733a44770
 2013-01-10 10:31:05 -06:00
Richard Peter
80bf1d7a28 Issue : Merge 13.1.2-6 into development 
Former-commit-id: d0a6ba23e5 [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]
Former-commit-id: 328be6ac2b
Former-commit-id: 6a5a0d7d09
 2013-01-09 17:55:05 -06:00
Bryan Kowal
777b804edc Issue - updated the memory settings for 64-bit GFE 
Change-Id: I40df3faed89bd23c5e37b81f3a4e6b256b5a2cc3

Former-commit-id: 6129a00225 [formerly 0645a9fe40] [formerly 73bdd66283 [formerly 2d6bf1e42cb628a5b5af6a261202d01c7fa236fb]]
Former-commit-id: 73bdd66283
Former-commit-id: e9dd794082
 2013-01-09 13:03:38 -06:00
Bryan Kowal
7dd7d1cfa7 Issue - Merge 4.7-GIS_Viewer into AWIPS2_baseline 
Former-commit-id: 87d0821429 [formerly 76fe910606] [formerly 03f108f80b [formerly 9e0eae1725af06ce834c926a4d70195a075e8152]]
Former-commit-id: 03f108f80b
Former-commit-id: bbeb6b5101
 2013-01-07 18:14:07 -06:00
Bryan Kowal
6d7f57c62a Issue - Merge 5-Data_Delivery into AWIPS2_baseline 
Former-commit-id: ab8b346489 [formerly c8a43edd9e] [formerly d6b4cb65f4 [formerly b535a90fb25287945485c10b3c85749c11285171]]
Former-commit-id: d6b4cb65f4
Former-commit-id: 146c43a606
 2013-01-07 12:16:01 -06:00
Steve Harris
82a1ed77a4 13.1.2-6 baseline 
Former-commit-id: efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 59969775ad
Former-commit-id: dbcae57f57
 2013-01-06 14:55:11 -06:00
Steve Harris
cd4185ef5c 13.1.2-2 baseline 
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
 2013-01-06 14:32:24 -06:00
Matt Nash
5de49c6734 Issue add pattern to p2-build.xml file to match the new cots product 
Change-Id: I5a30c7fd6067b1c59794983c67b8186775af3849

Former-commit-id: a661c27de7 [formerly cf0090b7d4] [formerly 87b4d4b4e6 [formerly a862d259af867bd15d381e05e421d8d653ae4f21]]
Former-commit-id: 87b4d4b4e6
Former-commit-id: 83b9a4dfb7
 2012-12-13 12:42:40 -06:00
Ron Anderson
f4624af03c Issue Comment out change in p2-build.xml to fix build 
Change-Id: I47d426383734b876d5def9ba03677ef7ff745403

Former-commit-id: c5cd2304a9 [formerly 5327d88a6d] [formerly 06fdf91a1c [formerly 4636ad873e7de401e6384dd42857265e962aa8d9]]
Former-commit-id: 06fdf91a1c
Former-commit-id: 17b983ba02
 2012-12-12 09:09:28 -06:00
Ron Anderson
14849786eb Merge "Issue Modifed AwipsCalender and added additional date/time related widgets" into development 
Former-commit-id: 4ba089395c [formerly d05dc0c6ca] [formerly 277c9cb0ec [formerly c6c26811ad96f862ae3ffb0e6d9056f0d9edecfb]]
Former-commit-id: 277c9cb0ec
Former-commit-id: 087af45be8
 2012-12-11 16:09:24 -06:00
Ron Anderson
01081fe723 Issue Modifed AwipsCalender and added additional date/time related widgets 
Change-Id: I123a63ff4a42d36b2a35229dff719eda49097f7b

Former-commit-id: cc883294f1 [formerly bc5f445ecf] [formerly 43881be47a [formerly 475861fe615a070f1a3cad18dd798ba6db6b66e8]]
Former-commit-id: 43881be47a
Former-commit-id: 641d268bd8
 2012-12-11 13:31:05 -06:00
Steve Harris
f02c1ef71d Merge branch 'ss_builds' (12.12.1-12) into development 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: 4d4771ee3a [formerly 43ddfe98c4] [formerly f6988eefff [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]
Former-commit-id: f6988eefff
Former-commit-id: 6287b32e7d
 2012-12-11 08:45:53 -06:00
Steve Harris
69ab975fab 12.12.1-12 baseline 
Former-commit-id: 89def5cf03 [formerly e8e41630e8] [formerly 6d610f8e8a [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 7bb37caa23
 2012-12-06 09:18:28 -06:00
Steve Harris
ff4131c2ee 12.12.1-8 baseline 
Former-commit-id: 2d338b4cec [formerly 19962f41ba] [formerly 5093a7c442 [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]
Former-commit-id: 5093a7c442
Former-commit-id: ee06a94735
 2012-12-06 09:02:51 -06:00
Max Schenkelberg
47c7518388 Issue Made GFE use descriptor for time matching and time storage and manipulation 
Amend: Fixed time matcher index error when no data is available in GFE

Change-Id: Ie222ba72cb3890d3dc32699828b45012cd1783e5

Former-commit-id: b744ba68e0 [formerly 624cafb066] [formerly 1328deac56 [formerly 974ef3068d48244ca622edc17045266cc34b6468]]
Former-commit-id: 1328deac56
Former-commit-id: c5536a9a84
 2012-11-30 14:17:50 -06:00
Bryan Kowal
ae64e9ce3b Issue - the Linux CAVE thinclient and the MSFT Windows CAVE thinclient will now <b>always</b> include the same CAVE features 
Change-Id: Ib0f1a90fc55293cff2d43d236bec93001d93e8bf

Former-commit-id: 3a4ca9582d [formerly d3b455c955] [formerly f99d351995 [formerly ca0b97b8d8db19900107ab38f6a6af8a9ee7b935]]
Former-commit-id: f99d351995
Former-commit-id: b0c65323b6
 2012-11-28 16:30:10 -06:00
Dustin Johnson
5d5dbe27e1 Merge branch 'ss_builds' (12.12.1-4) into development 
Conflicts:
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java

Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71

Former-commit-id: d27bce13c2 [formerly bff32bbe58] [formerly 0d1d663f41 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]
Former-commit-id: 0d1d663f41
Former-commit-id: e25b7c312b
 2012-11-14 14:41:57 -06:00
Steve Harris
e35a321a8c 12.12.1-4 baseline 
Former-commit-id: b91b7f0fae [formerly 85130eb611] [formerly 57578da521 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]
Former-commit-id: 57578da521
Former-commit-id: 628ca9e5c6
 2012-11-14 14:19:20 -06:00
Steve Harris
21ecd53719 Merge branch 'ss_builds' (12.12.1-3) into development 
Former-commit-id: 8fc896f7d4 [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]
Former-commit-id: 00f3d51546
Former-commit-id: c8cac52915
 2012-11-13 17:28:50 -06:00
Steve Harris
111e7607cf 12.12.1-2 baseline 
Former-commit-id: ed809a02db [formerly a8560580f8] [formerly 6868eb9b23 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]
Former-commit-id: 6868eb9b23
Former-commit-id: df89fe9bed
 2012-11-13 17:14:24 -06:00
Ben Steffensmeier
109ec1e778 Merge branch 'ss_builds'(12.12.1-1) into development 
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
	pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc

Former-commit-id: ed4f88aa22 [formerly 69fc030bb4] [formerly e8090e654b [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]
Former-commit-id: e8090e654b
Former-commit-id: 60f78c22e3
 2012-11-13 16:00:19 -06:00
Steve Harris
4f243de928 12.12.1-1 baseline 
Former-commit-id: c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e1498006c7
Former-commit-id: 214fcd3b63
 2012-11-07 12:41:20 -06:00
Dustin Johnson
e7a0f96a9a Issue Merge branch '5-Data_Delivery' into development 
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 8e69107b5a [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 31d7d09c10
Former-commit-id: bcf575966b
 2012-11-01 13:36:06 -05:00
Ben Steffensmeier
9b8f2bcdbd merge Unified_Grid with ss_builds to 12.11.1-7 
Former-commit-id: 4f503d3a1e [formerly 6a9ff88b33] [formerly c2934ae7a5 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]
Former-commit-id: c2934ae7a5
Former-commit-id: a77d2097f8
 2012-10-25 12:22:11 -05:00
Steve Harris
2c82d9cb07 12.11.1-4 baseline 
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: 6958b861f0
Former-commit-id: cbbdb231ce
 2012-10-16 13:27:07 -05:00
Ben Steffensmeier
fde1e73d58 Merge branch 'ss_builds' into Unified_Grid 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml

Former-commit-id: de3769129c [formerly 8b7256b1ae] [formerly 266a2f317f [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]
Former-commit-id: 266a2f317f
Former-commit-id: fed5a35af3
 2012-10-12 12:45:50 -05:00
Steve Harris
772c60efa4 12.11.1-2 baseline 
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

Former-commit-id: 75901860c2 [formerly c12ee14e66] [formerly 1e02387ff1 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]
Former-commit-id: 1e02387ff1
Former-commit-id: 42bf60b2fc
 2012-10-08 13:26:20 -05:00
Steven Harris
f5e63d5f93 12.11.1-1 baseline 
Former-commit-id: 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: feec28f274
Former-commit-id: 8843ffd022
 2012-09-27 15:57:45 -05:00
Steve Harris
b18e5b5f2e 12.10.1-7 baseline 
Former-commit-id: 2ee78eaf6d [formerly b754630136] [formerly 7b37cfca85 [formerly 161fb1c0295ff4aa3b78d06ae248255d77a4e886]]
Former-commit-id: 7b37cfca85
Former-commit-id: 30592ab872
 2012-09-25 10:21:10 -05:00
Ben Steffensmeier
9512238d6e Issue convert viz/d2d displays from grib to grid. 
Former-commit-id: 8e5b20236d [formerly 9632663c0a] [formerly f918b6636f [formerly 003825d9634299773ad96843cc82d56ded8a1391]]
Former-commit-id: f918b6636f
Former-commit-id: 6c38e6abb2
 2012-09-24 14:05:22 -05:00