Commit graph

497 commits

Author SHA1 Message Date
root
3e9d1fa430 Merge branch 'reconcile' into development_on_ss_builds
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java

Former-commit-id: b93989daaf [formerly 6e4d168bf9ea0c252d0923e4e2595d9c4df06289]
Former-commit-id: ba40e18fb2
2012-08-15 22:29:07 +00:00
root
8a66b2f209 Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]
Former-commit-id: 5a453ee984
2012-08-15 22:15:20 +00:00
Nate Jensen
b7bc962da4 Merge "Issue #1033 do not load grib data on tileset creation but instead load allow it to load async." into development_on_ss_builds
Former-commit-id: 9c1597b554 [formerly 631ffe5bcec2a03934ac2063352b11aa6ab04ff7]
Former-commit-id: 6897b1d480
2012-08-15 16:18:36 -05:00
Ben Steffensmeier
74acf329c4 Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
Former-commit-id: cb99170685 [formerly 97d786afadf136f75ffd6a440d35b628e144b888]
Former-commit-id: b194a17abc
2012-08-15 15:25:46 -05:00
Jonathan Sanchez
e584d728f0 Issue #915 Set the user data.
Former-commit-id: 865136f6ef [formerly d0e0b6160cc0969353555bd7282829a3440c9ef6]
Former-commit-id: 03ed8ee0b0
2012-08-15 14:05:50 -05:00
Lee Venable
a3651c5813 Merge "Issue #1055: Fix coop precip breakage from Wes2Bridge db changes." into development_on_ss_builds
Former-commit-id: 457d099cca [formerly cf7be4b4a2a49f365258f1ac6262b64e86e705e4]
Former-commit-id: 2c2a3f4aec
2012-08-14 14:26:10 -05:00
Ben Steffensmeier
ea551d3866 Issue #1058 fix reprojection of wind vectors
Former-commit-id: c25c08c8e7 [formerly 315965383123120bffe1faa1d63fdfb7b633bc97]
Former-commit-id: 09c412d754
2012-08-14 13:44:21 -05:00
David Gillingham
e51d931a5a Issue #1055: Fix coop precip breakage from Wes2Bridge db changes.
Change-Id: Idbbbf7622483c426efc715f9e8eb185be6d47bad

Former-commit-id: b587c1ea4f [formerly da6811db78e3fcf57acc25e417ec8319c1dceecf]
Former-commit-id: f2795370d1
2012-08-14 13:36:51 -05:00
Nate Jensen
2cc3c63ba7 Merge "Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings." into development_on_ss_builds
Former-commit-id: eeaa2c798f [formerly 70f2bcb38c03eee2d389774f92a4676b0d4cae43]
Former-commit-id: 4211a8deac
2012-08-09 17:18:38 -05:00
Ben Steffensmeier
65c33256d9 Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
Former-commit-id: 066a5af2a6 [formerly 51acdac79ebfa11abb5d69707a0a7b059e1a2e57]
Former-commit-id: ad1415948f
2012-08-09 17:16:38 -05:00
Jonathan Sanchez
7ad6329fe0 Issue #883 Sorted warning records and prevented altered entries to be in
the same frame as new entries.


Former-commit-id: 6507a97665 [formerly 5c8c0783c8e054792ac38b4487188495dd0b0319]
Former-commit-id: fa7795d17f
2012-08-09 08:26:21 -05:00
Ben Steffensmeier
b6cc71bf75 Issue #947 fix parsing of DataTime.
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: 97ba96759c [formerly 30ebbadbbffce0c3b1a236d36be5f3013124e7cd]
Former-commit-id: 5da238c8b9
2012-08-08 14:41:33 -05:00
Ben Steffensmeier
ea70488664 Issue #1004 make dispose/shutdown of plot jobs more permenant by joining.
Former-commit-id: c9774a4f03 [formerly 4c5e5e0d54c523723edd16b756dc1caf208f5cd6]
Former-commit-id: 83d6cde368
2012-08-07 12:03:13 -05:00
Steve Harris
533d58b312 Merge branch 'development' into development_on_ss_builds
Former-commit-id: 32ee17d124 [formerly 69faa80856ac4c63f9cc79ccd7370e129093f091]
Former-commit-id: 515c8ec596
2012-08-06 12:57:56 -05:00
Steve Harris
62e9207ba7 Merge branch '21.2-Warngen_Urban_Boundaries' into development_on_ss_builds
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java

Former-commit-id: d90c5f989d [formerly 2a2487546a533987bc618b06780bba4d0bc61da8]
Former-commit-id: f3babcf1a1
2012-08-06 11:13:47 -05:00
Steve Harris
b2432e096f Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds
Conflicts:
	rpms/awips2.64/Installer.h5py/component.spec

Former-commit-id: f0b7d5e4c5 [formerly f6fc0581c3100ef186b90668cb1f1ae4283eaa7b]
Former-commit-id: 85f82b18b3
2012-08-06 09:38:26 -05:00
Steve Harris
d5563fc340 12.8.1-10 baseline
Former-commit-id: b5e8fee24d [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]
Former-commit-id: ca25d508ec
2012-08-06 09:34:26 -05:00
Jonathan Sanchez
f26cce33a9 Issue #1006 Implemented urban areas.
Former-commit-id: dbd30e3b67 [formerly 8f7bbb2509278237184cbcee81ff1cc6eb61aa72]
Former-commit-id: 62db15b6f4
2012-08-06 08:41:52 -05:00
Steve Harris
8f4ddad22c Merge branch 'development' into development_on_ss_builds
Former-commit-id: 24799cd93d [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]
Former-commit-id: a1071e3204
2012-08-06 08:23:04 -05:00
Ben Steffensmeier
6ccc09e0b4 Issue #988 set statem bits on underlieing image for GLDelegate Image
Former-commit-id: 0f7dd0f4cd [formerly 39444045f7cc4f4e4fac86b15ca7b98cf2cb9ded]
Former-commit-id: 5fe65c6538
2012-08-03 16:39:33 -05:00
Ben Steffensmeier
942b0e5315 Issue #978 GChange GridResource to use its own times rather than descriptor times.
Former-commit-id: 8346805ed2 [formerly 1481f818fed5ff9f18387d8fcbd9c30da37a9dd7]
Former-commit-id: 090b9f5ccb
2012-08-03 15:52:47 -05:00
Richard Peter
c61f4f8245 Merge "Issue #798 - Force interpolationLevels in derived satellite" into development
Former-commit-id: fd051c19d4 [formerly 622e8119ab53ed34e5249c67186343203a56b821]
Former-commit-id: 131ba842e9
2012-08-03 14:32:35 -05:00
James Korman
b27f4fb5e5 Issue #798 - Force interpolationLevels in derived satellite
Former-commit-id: 1bc1784478 [formerly ffcc7cfa6e7c2ce0f406becff390781ceee7faa3]
Former-commit-id: 317acc38fe
2012-08-03 14:14:53 -05:00
Ben Steffensmeier
e9cde98072 Issue #1001 synchronize paint with add.
Former-commit-id: 2c9737ca5c [formerly 825c08e6ce89b0c4b042c9e85f7abbc7b9a675ef]
Former-commit-id: 798d26e954
2012-08-03 14:10:04 -05:00
Steve Harris
3476fe755b Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	rpms/awips2.64/Installer.h5py/component.spec
	rpms/awips2.64/Installer.python/component.spec
	rpms/awips2.64/Installer.python/src/lapack.patch1
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/python.site-packages/Installer.pupynere/component.spec

Former-commit-id: 6d77b94217 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]
Former-commit-id: 51e38ca887
2012-08-01 12:43:12 -05:00
Max Schenkelberg
74f0179b92 Issue #626 Changed downscaler so it can scale from any level to another level instead of always using full resolution level. Fixed Float.NaN reference in AbstractDataWrapper. Fixed GLMesh leak in AbstractTileSet.
Change-Id: I5e36d3a7632f54c19c81818c270b28ac60a385ac

Former-commit-id: f635e9c332 [formerly 0f59e9ea9e204bc49e14135249ef859903a2cbcb]
Former-commit-id: cc0a1fbca3
2012-08-01 10:51:32 -05:00
Steve Harris
e0c3722fd1 12.8.1-5 baseline
Former-commit-id: fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]
Former-commit-id: cd49ef3eda
2012-08-01 10:45:37 -05:00
James Korman
5df52e38f9 Issue #798 - Code review changes
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb

Former-commit-id: 38a2e426d9 [formerly cb05a9f95384806537106dc804833331d6c7db48]
Former-commit-id: 4cbbc59278
2012-07-31 13:38:23 -05:00
Richard Peter
c379c2f884 Merge "Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks." into development
Former-commit-id: 97a1d083cd [formerly 4b7c1b1876f07de56c8f915d7c4a9c7707ccdf13]
Former-commit-id: 8631b64e75
2012-07-31 09:16:23 -05:00
Nate Jensen
8fa0eb70db Issue #882 improved use of SimulatedTime
Change-Id: I624427fe42f0d74bc62900216596e724857830fc

Former-commit-id: a65e9608fd [formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]
Former-commit-id: 4a2841b287
2012-07-31 08:57:54 -05:00
Ron Anderson
6a3e6f599f Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks.
Change-Id: I1d3818cf90d21d3cc725b9a83e55eb5068b7aa62

Former-commit-id: 7c6686f2f4 [formerly 181fba1a75357aa39a54267c6df907075f4601dc]
Former-commit-id: b1650b6143
2012-07-31 08:36:27 -05:00
Ron Anderson
6b7f1b3611 Issue #851 removed obsolete GFE code.
Change-Id: I3713b0e265bec9e32cde3c20bc4dae12f6b20a02

Former-commit-id: 35d140f0fb [formerly c91b6fc2c506096f37f175e8196f9aaeb356141d]
Former-commit-id: d87c0b6c4b
2012-07-30 15:34:16 -05:00
Steve Harris
b82d6772c3 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: de9034c96c [formerly d2a398126648eaf391ddf39f99a77c0f40d08618]
Former-commit-id: 4688ac304f
2012-07-27 14:50:45 -05:00
Steve Harris
2aa4114e4d Merge branch 'master' (OB12.7.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
	cave/com.raytheon.uf.viz.points/.classpath
	cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
	deltaScripts/.pydevproject
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.climo/.classpath
	edexOsgi/com.raytheon.uf.common.climo/.project
	edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
	edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
	edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
	edexOsgi/com.raytheon.uf.common.hlstopo/.project
	edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
	edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
	edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.common.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.edex.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.tafqueue/com.raytheon.uf.edex.tafqueue.ecl
	edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml
	nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
	nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.gfe/component.spec
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
	rpms/awips2.core/Installer.rcm/scripts/conf/start-config
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/build/release/buildCoreRPMs.sh
	rpms/common/yum/arch.x86/comps.xml
	tools/devAutoDeploy/devAutoDeploy.ecl

Former-commit-id: 56249c2611 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]
Former-commit-id: 587bb6a274
2012-07-27 14:44:44 -05:00
Nate Jensen
67edb6917d Issue #882 fix auto updates, more efficiently set simulated time
Change-Id: I29f497df91920618e5271bf0ff436547d6225413

Former-commit-id: 3d07fc8ebf [formerly da03e63d10f5f7b6fa77d0e302b11e7501475e22]
Former-commit-id: dbe185f3a0
2012-07-26 17:43:29 -05:00
Ben Steffensmeier
3e9abe8682 Issue #924 fix some concurrency issues for GridResource
Former-commit-id: e18782687c [formerly 312361f3bacf9ed935ee7cd69be90192af34b3fd]
Former-commit-id: de742a4b8c
2012-07-25 17:33:24 -05:00
Ben Steffensmeier
6f9ec1af50 Issue #921 register GFEColorbarResource as a listener when recycling.
Change-Id: I21e990d4225b5bcf44aac6f2a3c4442442ec51b0

Former-commit-id: e3cfa52237 [formerly 90ce1b3643af750a19bc29156137f18848e7dc77]
Former-commit-id: 044836cd2c
2012-07-24 11:29:51 -05:00
Ron Anderson
bc034e1863 Issue #851 Fixed issues with DatabaseID.dateFormat
Change-Id: Ia5d99932059cec78074096e9ef08fa7b90b13e72

Former-commit-id: 1f2e581534 [formerly 1816e3f6c96b1064d52a2cbdf75ae02fb27e3693]
Former-commit-id: b52f1400ef
2012-07-23 16:49:21 -05:00
Ben Steffensmeier
cb08c202ef Issue #924 fix concurrency issues for Grid products
Former-commit-id: 0b951d425d [formerly 767173dc95dc811bc94081415a214803403985f5]
Former-commit-id: 9abd645758
2012-07-19 17:37:15 -05:00
Ben Steffensmeier
10706db0b1 Issue #910 fix Memory Leak in GLDelegate Images, add Graphics memory logging.
Change-Id: I07635279472c5f4a605f00cbdde81e961eb9e757

Former-commit-id: 5df07dac9f [formerly e4d9419134f7fcfd47dfe84e55764309d3d65257]
Former-commit-id: 98218ec3cd
2012-07-19 17:12:31 -05:00
Steve Harris
9f97182964 12.7.1-8 baseline
Former-commit-id: 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]
Former-commit-id: c42ae0fa39
2012-07-19 16:20:40 -05:00
Nate Jensen
33611406a4 Merge "Issue #626 Moved menu changes required for NPP to be in satellite menu from old repo into common/core. Fixed AbstractDataCubeAdapter to add System date to time request and fixed GLCMTextureData race condition if sampling a texture that has been created but not staged" into development
Former-commit-id: bad816a50e [formerly 3786f2c0a7add2d36b27b92e2a8efd235b65e147]
Former-commit-id: 0fd6c7d56c
2012-07-19 15:31:55 -05:00
Max Schenkelberg
bc0ec0455d Issue #626 Moved menu changes required for NPP to be in satellite menu from old repo into common/core. Fixed AbstractDataCubeAdapter to add System date to time request and fixed GLCMTextureData race condition if sampling a texture that has been created but not staged
Change-Id: I845caf8bedb4b27d16874c2a0a633554412d6dd4

Former-commit-id: c8909c0fbc [formerly fb323d9e48c7f35f68d188d4f8fbb677971ebbb1]
Former-commit-id: d8971a72fd
2012-07-19 11:45:01 -05:00
Ben Steffensmeier
1393fa1d14 Issue #772 synchronize sat getImages with paint and dispose to avoid errors when disposing while mosaicing.
Former-commit-id: 144dd7bab9 [formerly 84055039ccd601f4be4546f97cde99faf33b7818]
Former-commit-id: eab4b1cd78
2012-07-18 17:53:51 -05:00
Roger Ferrel
aa7b01b330 Issue #875 Modfications to prevent null pointer exeception when no map displayed.
Change-Id: Ia20c00021c3c2741b30679c72c01b245cdb4c504

Former-commit-id: c908de0d82 [formerly 7eaa2860847149879bb62a637e6677675dd5c7ec]
Former-commit-id: 3cfd8547b4
2012-07-16 11:10:23 -05:00
Nate Jensen
565100d787 Merge "Issue #808 create API for managing floating views and made CaveDetachedWindow more robust." into development
Former-commit-id: c0dad4432c [formerly 80746bd2c441de92304fb1dabdcfbd66ce3f49a6]
Former-commit-id: 1b3d6560e4
2012-07-12 17:17:57 -05:00
Ben Steffensmeier
1c68f4e01e Issue #808 create API for managing floating views and made CaveDetachedWindow more robust.
Former-commit-id: ea0c7046af [formerly 1f9b6d2a0b7d45f68bda57c6fcaeec493cbb835a]
Former-commit-id: 8984b35ff8
2012-07-12 13:35:52 -05:00
Roger Ferrel
b3df932794 Issue #875 - Create com.raytheon.uf.viz.points
Amend: fixing code per review comments

Change-Id: I52249180e5a1af37854bc522ada50cc27bc24627

Former-commit-id: 0cf7d64cf4 [formerly f3d38c3b1ea1b8118f90ce38937a689a9581b2bb]
Former-commit-id: 9071334fe9
2012-07-12 11:32:03 -05:00
Bryan Kowal
fa5eb7a16a Merge branch 'merge_development' into development
Former-commit-id: 051a51b79c [formerly 1b662d79bad6e259c61ae95a85e2f102fa06c2fa]
Former-commit-id: b27994c9b1
2012-07-10 17:03:21 -05:00
Bryan Kowal
580172b47c Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
Former-commit-id: 99d22f395a [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]
Former-commit-id: f92eb59a73
2012-07-10 16:57:16 -05:00