Steve Harris
dbe07ca70c
Merge branch 'development' into development_on_ss_builds
...
Former-commit-id: 54c505dd8e24799cd93da1071e3204a1071e32048f4ddad22c
2012-08-06 08:23:04 -05:00
Steve Harris
d2291ba23f
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: fb479341596d77b9421751e38ca88751e38ca8873476fe755b
2012-08-01 12:43:12 -05:00
Bryan Kowal
5b7330ca01
Issue #970 - ensure that g2int has the same definition throughout grib2 and all dependencies; updated variable types based on function signatures.
...
Change-Id: If25d724c18ff5a9d09f94d77304ec729866158e6
Former-commit-id: 6126e4316a485334331ad07281ac51d07281ac51024a23e7a3
2012-08-01 11:50:24 -05:00
Steve Harris
dab00b12e6
12.8.1-5 baseline
...
Former-commit-id: 2653ddc2e3fd2abfb6f1cd49ef3edacd49ef3edae0c3722fd1
2012-08-01 10:45:37 -05:00
Steve Harris
9e4df42326
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: 07c40a9c0c56249c2611587bb6a274587bb6a2742aa4114e4d
2012-07-27 14:44:44 -05:00
Steve Harris
f2102bfb24
12.7.1-8 baseline
...
Former-commit-id: 11f96dbedd16bf591a33c42ae0fa39c42ae0fa399f97182964
2012-07-19 16:20:40 -05:00
Bryan Kowal
541b59d060
Merge branch 'merge_development' into development
...
Former-commit-id: 226818bda5051a51b79cb27994c9b1b27994c9b1fa5eb7a16a
2012-07-10 17:03:21 -05:00
Bryan Kowal
8d64fdba2c
Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
...
Former-commit-id: c629f18f2499d22f395af92eb59a73f92eb59a73580172b47c
2012-07-10 16:57:16 -05:00
Steve Harris
45ac1d4d51
Issue #817 - replacing files that were somehow lost between 12.6.1-9 and 12.6.1-10
...
These files have existing camel-cased equivalents and may not be needed.
Former-commit-id: 8fff0d7e53479ccdbed29454393d139454393d13330b9c3174
2012-07-10 09:29:33 -05:00
Steve Harris
efe25edfad
12.6.1-10 baseline
...
Former-commit-id: edac4d827c8dc4a774e23cd0902b493cd0902b49eacd5aeb7f
2012-06-21 08:58:00 -05:00
Steve Harris
97c4db937e
12.5.1-15 baseline
...
Former-commit-id: 8552902906b13cbb7e003904c4ccf53904c4ccf5676ea3192f
2012-06-08 13:39:48 -05:00
Steve Harris
4792884ab2
12.5.1-6 baseline
...
Former-commit-id: df80148db624474489f9fa87dc6cf1fa87dc6cf1c452cce633
2012-05-16 16:41:22 -05:00
Steve Harris
f6300cd995
12.5.1-2 baseline
...
Former-commit-id: ac708c050d84d191e7b6b36c69cc67b36c69cc67a821111fbf
2012-05-03 19:17:13 -05:00
Steve Harris
33a67cdd82
12.4.1-10 baseline
...
Former-commit-id: 4bfbdad17d9f8cb727a58485b90ff88485b90ff8a28d70b5c5
2012-05-01 18:06:13 -05:00
Steve Harris
97caaa0327
12.4.1-10 baseline
...
Former-commit-id: 418489e726704b75e1a101457fbbde01457fbbdeaabc3842ac
2012-04-24 15:38:29 -05:00
Steve Harris
a2a6a18fae
12.4.1-4 baseline
...
Former-commit-id: 750b7543dd67a5a683002a216f333c2a216f333ca4e519f3cd
2012-04-18 15:18:16 -05:00
Steve Harris
8bc60b1e32
12.3.1-10 baseline
...
Former-commit-id: 0e4128712b4068f5295f22bd792cd922bd792cd9ce3b74c605
2012-03-30 08:38:33 -05:00
Bryan Kowal
8a71854fe1
Issue #182 - the meteolib Activator will now return a properly formatted path to the meteolib dll when on a Windows workstation. The meteolib "cape function" will now acurrately report if it is out of memory.
...
Former-commit-id: d4b76c10574276fc2fe89f1b7a613a9f1b7a613a38ccaf882b
2012-02-17 11:09:13 -06:00
Steve Harris
a85a777232
Merge commit 'awips2_OB12.1.1_Omaha' into 4-Thin_Client
...
Conflicts:
msi/AWIPSII.CAVE/AWIPSII.CAVE/ipr.gif
msi/AWIPSII.CAVE/AWIPSII.CAVE/obj/x86/Release/_DELETE_ME_
nativeLib/rary.cots.jepp/jepp-2.3/windows/Release/_DELETE_ME_
Chose to keep in 4-Thin_Client
Former-commit-id: 221a02882ab9f4780fcb23cc9689de23cc9689dea2e3aabc60
2012-02-15 14:39:43 -06:00
Bryan Kowal
134b8f2915
Issue #243 - it is now possible to build meteolib on Windows; meteolib, jep, and gridslice are now all built using MSBuild when built from the command line.
...
Former-commit-id: 2fabaff1d938eb4bd2b6521756e57e521756e57e1c023403e2
2012-02-15 10:31:58 -06:00
Ben Steffensmeier
993f2aafa4
Issue #176 remove id from dataURI notifications
...
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58
Issue #342 - edex_com, edex_notify, and awips2-notification updates.
Change-Id: Iba95d0fac10f40c76db4a46924f93cbbe40da4a2
Former-commit-id: 808846e237944e59e989f65d86a06af65d86a06ad00572c122
2012-02-14 15:46:11 -06:00
Bryan Kowal
0bf4fecb62
Issue #243 - standardized the Windows build of jep and gridslice. Both can be built from within Visual C++ 2008 or headless via a cmd console.
...
Former-commit-id: c78e988d5567562b06744faf9831ed4faf9831edeb91bb964e
2012-02-13 13:57:10 -06:00
Bryan Kowal
1821f12dee
Issue #197 - merging gridslice changes into git thinclient branch.
...
Former-commit-id: 3fecaf9a5a710c7af072a48a3094f0a48a3094f0ebcff5bae9
2012-01-23 13:40:59 -06:00
Bryan Kowal
f6b08149ad
Issue #24 - merging jep changes into git thinclient branch.
...
Former-commit-id: be0b6a87eb5039d66b12cf4d56d0a0cf4d56d0a090c33ef882
2012-01-23 13:25:11 -06:00
Matt Nash
82300ccdcf
Moving 12.1.1 into ss_sync
...
Former-commit-id: 580e2938d766be3bec40c83e5ff474c83e5ff4741faae42484
2012-01-19 11:53:12 -06:00
root
8e80217e59
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: a02aeb236c9f19e3f71206a8b51d6d06a8b51d6d3360eb6c5f
2012-01-06 08:55:05 -06:00
