Steve Harris
|
d27c5237c3
|
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: f6988eefff [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]
Former-commit-id: 43ddfe98c4
Former-commit-id: 4d4771ee3a
|
2012-12-11 08:45:53 -06:00 |
|
Steve Harris
|
8b74846a1b
|
12.12.1-12 baseline
Former-commit-id: 6d610f8e8a [formerly e8e41630e8 [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]
Former-commit-id: e8e41630e8
Former-commit-id: 89def5cf03
|
2012-12-06 09:18:28 -06:00 |
|
Steve Harris
|
8790caf84e
|
12.12.1-8 baseline
Former-commit-id: 5093a7c442 [formerly 19962f41ba [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]
Former-commit-id: 19962f41ba
Former-commit-id: 2d338b4cec
|
2012-12-06 09:02:51 -06:00 |
|
Bryan Kowal
|
b1b627e2c2
|
Issue #1318 - updated ncep database rpm specification file
Change-Id: Ie4b5ef9b76ce96e21e68f40ffc194cb584a1e832
Former-commit-id: fe9dcaa216 [formerly b60dda550c [formerly b3f1b857e5a8efcfea0f5b8985eddd5992724d89]]
Former-commit-id: b60dda550c
Former-commit-id: cbef9ad78d
|
2012-11-15 10:24:38 -06:00 |
|
Bryan Kowal
|
fec5563e49
|
Issue #1318 - updated ncep database rpm specification file
Change-Id: Iac80537a3fcc7998f93d5a3db9e842d7eea141d9
Former-commit-id: 24074da383 [formerly 99399e880e [formerly f433daa8ffe59da91acba71ac5893d77ad810404]]
Former-commit-id: 99399e880e
Former-commit-id: 12667f6180
|
2012-11-15 09:26:46 -06:00 |
|
Dustin Johnson
|
069c8d4788
|
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: 0d1d663f41 [formerly bff32bbe58 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]
Former-commit-id: bff32bbe58
Former-commit-id: d27bce13c2
|
2012-11-14 14:41:57 -06:00 |
|
Steve Harris
|
b968ab5135
|
12.12.1-4 baseline
Former-commit-id: 57578da521 [formerly 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]
Former-commit-id: 85130eb611
Former-commit-id: b91b7f0fae
|
2012-11-14 14:19:20 -06:00 |
|
Steve Harris
|
1ee8938748
|
Merge branch 'ss_builds' (12.12.1-3) into development
Former-commit-id: 00f3d51546 [formerly 448dd1c35f [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]
Former-commit-id: 448dd1c35f
Former-commit-id: 8fc896f7d4
|
2012-11-13 17:28:50 -06:00 |
|
Steve Harris
|
7192b19284
|
12.12.1-2 baseline
Former-commit-id: 6868eb9b23 [formerly a8560580f8 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]
Former-commit-id: a8560580f8
Former-commit-id: ed809a02db
|
2012-11-13 17:14:24 -06:00 |
|
Steve Harris
|
8278cac143
|
12.12.1-1 baseline
Former-commit-id: e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e4bd20a515
Former-commit-id: c2839cc86d
|
2012-11-07 12:41:20 -06:00 |
|
Dustin Johnson
|
7d0e4a6e75
|
Issue #1302 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: 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 98d7beae50
Former-commit-id: 8e69107b5a
|
2012-11-01 13:36:06 -05:00 |
|
Steve Harris
|
3a9c6123d2
|
Merge branch 'ss_builds' (12.11.1-7) into development
Former-commit-id: 38b9c03f5e [formerly b7406a55cc [formerly 92fcd9f3f15f3bbd49934ea04e4fb6e02c4b8684]]
Former-commit-id: b7406a55cc
Former-commit-id: d42e8373c6
|
2012-10-23 16:43:09 -05:00 |
|
Steve Harris
|
59e5b55b96
|
12.11.1-7 baseline
Former-commit-id: 79a5638de9 [formerly d8ca6b9005 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]]
Former-commit-id: d8ca6b9005
Former-commit-id: 40a5bc1683
|
2012-10-23 16:40:50 -05:00 |
|
Richard Peter
|
d0f2925f45
|
Merge "Issue #1265 remove pypies gzip handling" into development
Former-commit-id: cd9306a537 [formerly 3723250e50 [formerly fd47306a1247721d53b227bf94cc94818b4efc39]]
Former-commit-id: 3723250e50
Former-commit-id: 935ddb3224
|
2012-10-17 14:07:28 -05:00 |
|
Nate Jensen
|
4fc0bee363
|
Issue #1265 remove pypies gzip handling
Change-Id: Ia79c1b7b2440849893bacf5cd8290fb5627ed4e5
Former-commit-id: 2dac2f5dde [formerly fa3e87549a [formerly 6bb4d39b266bedbecff6ecda95bf05e65aa1e58c]]
Former-commit-id: fa3e87549a
Former-commit-id: 7874be59e7
|
2012-10-17 11:32:49 -05:00 |
|
Steve Harris
|
37ab3d9e65
|
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 5e5c98b193 [formerly a63b40b17a [formerly ecb6a8876078dcff3414ff2a33aa14bf130fa075]]
Former-commit-id: a63b40b17a
Former-commit-id: 4ffbffe349
|
2012-10-16 21:44:49 -05:00 |
|
Steve Harris
|
c19835d4be
|
Merge branch 'ss_builds' (12.11.1-4) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/procedures/IAlterBundleContributor.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/AlterBundleDlg.java
cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/CoordinateInputPanel.java
cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointEditDialog.java
cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java
cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java
cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/BaseRadarProductUI.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsAlterBundleContributor.java
cave/com.raytheon.viz.gfe/help/EXAMPLElocalMaps.py
cave/com.raytheon.viz.gfe/help/EXAMPLElocalMapsAdd.py
cave/com.raytheon.viz.gfe/help/localMapsConfig.html
cave/com.raytheon.viz.gfe/help/mapConfig.html
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/WorldWrapCorrector.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
rpms/common/yum/arch.x86/comps.xml
Former-commit-id: 751563e331 [formerly 4610ecc513 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]
Former-commit-id: 4610ecc513
Former-commit-id: da7a11fe97
|
2012-10-16 15:48:14 -05:00 |
|
Steve Harris
|
6e44abdba1
|
12.11.1-4 baseline
Former-commit-id: 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: d3497e47eb
Former-commit-id: 98171b5de9
|
2012-10-16 13:27:07 -05:00 |
|
Greg Armendariz
|
24cfef1397
|
Merge changes Ibe8b9a97,If48f637e into development
* changes:
Issue #1252 - Checked in wrong file. Deleting it. Change-Id: Ibe8b9a9708e37f7e697e7133b98d24a0060ebd37
Issue #1252 - Updated with changes from Dale Morris
Former-commit-id: b8de817d68 [formerly d1772b3705 [formerly ab6631a9b47cb5bc6716bc3ba9805bd40665f785]]
Former-commit-id: d1772b3705
Former-commit-id: 2d18d5791a
|
2012-10-16 12:59:00 -05:00 |
|
Nate Jensen
|
134d8a2e3b
|
Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae
Former-commit-id: 8e4a7ec406 [formerly f2cbf0c5c3 [formerly 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1]]
Former-commit-id: f2cbf0c5c3
Former-commit-id: cbc2da0c06
|
2012-10-12 15:16:27 -05:00 |
|
James Korman
|
3ce7b04eab
|
Issue #1252 - Checked in wrong file. Deleting it.
Change-Id: Ibe8b9a9708e37f7e697e7133b98d24a0060ebd37
Former-commit-id: fd783767b2 [formerly aca18f0a37 [formerly a9e332dd585910aa6094d30c3e883451fb0df237]]
Former-commit-id: aca18f0a37
Former-commit-id: c2a4c48f5d
|
2012-10-12 14:48:59 -05:00 |
|
James Korman
|
8d71a3dc92
|
Issue #1252 - Updated with changes from Dale Morris
Former-commit-id: 20c61590a4 [formerly 2fad414d6d [formerly f48f637e60f7537da42681dc001332257a046d2b]]
Former-commit-id: 2fad414d6d
Former-commit-id: 6d5df727e5
|
2012-10-12 14:48:59 -05:00 |
|
Steven Harris
|
ffe3641057
|
12.11.1-1 baseline
Former-commit-id: feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: 618aa3f316
Former-commit-id: 0e86bfd1d3
|
2012-09-27 15:57:45 -05:00 |
|
Steve Harris
|
6cb180ff5b
|
Merge branch 'ss_builds' (12.10.1-8) into development
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
Former-commit-id: 3827a78a7b [formerly 8354ca4e68 [formerly 4ebdc29db766db49df46d568a320c1743d0bb7c0]]
Former-commit-id: 8354ca4e68
Former-commit-id: 686b1756c9
|
2012-09-25 10:31:57 -05:00 |
|
Steve Harris
|
dd922048c0
|
12.10.1-6 baseline
Former-commit-id: ba648f8e72 [formerly cebe6534ae [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]]
Former-commit-id: cebe6534ae
Former-commit-id: 81d91a8289
|
2012-09-25 10:14:23 -05:00 |
|
Steve Harris
|
bedc9569ca
|
Merge branch 'ss_builds' (12.10.1-4) into development
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 04d9735c8f [formerly 29e7427dc3 [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]
Former-commit-id: 29e7427dc3
Former-commit-id: 04de1d5857
|
2012-09-13 13:26:13 -05:00 |
|
Steve Harris
|
0d8d18d7e2
|
12.10.1-4 baseline
Former-commit-id: 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: fd19ca5624
Former-commit-id: e38e81ab8c
|
2012-09-13 12:08:11 -05:00 |
|
Steve Harris
|
0403e7d0a9
|
12.10.1-3 baseline
Former-commit-id: 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]
Former-commit-id: 21f430062b
Former-commit-id: de1639aea2
|
2012-09-11 16:00:38 -05:00 |
|
James Korman
|
5b2c527640
|
Issue #1090 - pattern corrections
Former-commit-id: eb17151f74 [formerly be350dd763 [formerly 7849341873013b71b6fe5f01ae3fe274bfc7e8a7]]
Former-commit-id: be350dd763
Former-commit-id: 78c7ce88ac
|
2012-09-06 09:20:03 -05:00 |
|
Bryan Kowal
|
8444e742df
|
Issue #1130 - merging Wes2Bridge into Common Baseline Delivery II (cherry pick)
Former-commit-id: 3e1556a981 [formerly 137b27d3ff [formerly 9a0cd58382909965a6c44cf05fec28eb69835a26]]
Former-commit-id: 137b27d3ff
Former-commit-id: 35aff16e89
|
2012-09-05 14:44:36 -05:00 |
|
Steve Harris
|
9ff4f369a4
|
Merge branch 'ss_builds' (12.9.1-11) into development
Conflicts:
rpms/build/i386/build.sh
Former-commit-id: 34cbde4124 [formerly 3a9d4961e2 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]]
Former-commit-id: 3a9d4961e2
Former-commit-id: f52c8b374d
|
2012-08-30 14:40:34 -05:00 |
|
Steve Harris
|
264d870cbf
|
12.9.1-10 baseline
Former-commit-id: cb9b80f3a0 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]
Former-commit-id: 3adc50a783
Former-commit-id: bdb45cdfae
|
2012-08-30 14:28:27 -05:00 |
|
Steve Harris
|
57c1be9f5a
|
Merge branch 'ss_builds' (12.9.1-5) into development_on_ss_builds
Conflicts:
cave/com.raytheon.viz.ui/schema/editorMenuAddition.exsd
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/ContributedEditorMenuAction.java
edexOsgi/build.edex/edex/allElements.xml
edexOsgi/build.edex/edex/customAssembly.xml
edexOsgi/build.edex/esb/lib/lib_illusion/x86_64/libpython.so
edexOsgi/build.edex/esb/lib/native/linux64/libjep.so
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.guess
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.sub
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/depcomp
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/install-sh
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/ltmain.sh
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/missing
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/mkinstalldirs
nativeLib/rary.cots.jasper/jasper-1.900.1/configure
rpms/awips2.core/Installer.python/nativeLib/i386/grib2.so
rpms/awips2.core/Installer.python/nativeLib/i386/gridslice.so
rpms/awips2.core/Installer.python/nativeLib/i386/libjasper.so.1.0.0
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1.0.0
rpms/awips2.edex/deploy.builder/build.sh
rpms/build/i386/build.sh
tools/scripts/commit-msg
tools/scripts/git-u-setup
tools/scripts/uamend
tools/scripts/ucommit
tools/scripts/upull
tools/scripts/upush
tools/scripts/ustat
Former-commit-id: 44a7cb75e7 [formerly d38f8b80f0 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]]
Former-commit-id: d38f8b80f0
Former-commit-id: 084ac9fbd4
|
2012-08-21 16:17:58 -05:00 |
|
Steve Harris
|
77cbd6c1e5
|
12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: 61f269f54c
Former-commit-id: a1d931fd44
|
2012-08-21 15:27:03 -05:00 |
|
root
|
bb7b5341dd
|
Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]
Former-commit-id: cb46f57879
Former-commit-id: 0987fc6b3d
|
2012-08-15 22:15:20 +00:00 |
|
Steve Harris
|
8083b81729
|
12.9.1-3 baseline
Former-commit-id: 84bbf2573e [formerly 36d80b1f60 [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]
Former-commit-id: 36d80b1f60
Former-commit-id: c11f7d396e
|
2012-08-15 14:26:10 -05:00 |
|
Steve Harris
|
b9fb1c89d4
|
12.9.1-1 baseline
Former-commit-id: 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 31ae7ea218
Former-commit-id: 8309193ce9
|
2012-08-15 13:59:00 -05:00 |
|
Steve Harris
|
7e89b04a10
|
Merge branch 'development' into development_on_ss_builds
Former-commit-id: a1071e3204 [formerly 24799cd93d [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]]
Former-commit-id: 24799cd93d
Former-commit-id: 54c505dd8e
|
2012-08-06 08:23:04 -05:00 |
|
Steve Harris
|
0557c9a0c6
|
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: 51e38ca887 [formerly 6d77b94217 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]
Former-commit-id: 6d77b94217
Former-commit-id: fb47934159
|
2012-08-01 12:43:12 -05:00 |
|
Bryan Kowal
|
dd451f392f
|
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: d07281ac51 [formerly 485334331a [formerly 4dc6be0e1bf32b126a0685109131e1b4b3f5acd1]]
Former-commit-id: 485334331a
Former-commit-id: 6126e4316a
|
2012-08-01 11:50:24 -05:00 |
|
Steve Harris
|
2e804fc8c4
|
12.8.1-5 baseline
Former-commit-id: cd49ef3eda [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]
Former-commit-id: fd2abfb6f1
Former-commit-id: 2653ddc2e3
|
2012-08-01 10:45:37 -05:00 |
|
Steve Harris
|
7efcfa7d8d
|
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: 587bb6a274 [formerly 56249c2611 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]
Former-commit-id: 56249c2611
Former-commit-id: 07c40a9c0c
|
2012-07-27 14:44:44 -05:00 |
|
Steve Harris
|
b242dd98d6
|
12.7.1-8 baseline
Former-commit-id: c42ae0fa39 [formerly 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]
Former-commit-id: 16bf591a33
Former-commit-id: 11f96dbedd
|
2012-07-19 16:20:40 -05:00 |
|
Bryan Kowal
|
54ed0e824b
|
Issue #760 - upgraded the lapack library.
Change-Id: I4a6481514b407cd7e1719d94e4086b1051b3090e
Former-commit-id: 95d0565b6d [formerly 10cde34ffe [formerly 47b881f604fec3591827f66481ff820032278aa0]]
Former-commit-id: 10cde34ffe
Former-commit-id: 6a6dc780bc
|
2012-07-19 11:05:13 -05:00 |
|
Bryan Kowal
|
6f119cdb8a
|
Issue #913 - fix the correct RadarServer start-config file.
Former-commit-id: 132870666a [formerly 1e13956bce [formerly 10a2b1626a9388c1bf4244142fedd49d5b1d1d39]]
Former-commit-id: 1e13956bce
Former-commit-id: 0651a04d0e
|
2012-07-19 09:31:34 -05:00 |
|
Bryan Kowal
|
642bd6d582
|
Issue #913 - fixed the paths for Radar Server.
Change-Id: Ia86e7113ba679bdf4b9b2a83b243e1d3d5e3b208
Former-commit-id: 7524f8ad8d [formerly 0ecf2f92c1 [formerly f43666937b14fdee3dd06d6da42be42b67096b2b]]
Former-commit-id: 0ecf2f92c1
Former-commit-id: 2670a3d7b3
|
2012-07-18 11:12:09 -05:00 |
|
Bryan Kowal
|
0b49b7db45
|
Issue #889 - specified the full path to awips2-ant.
Former-commit-id: 41bb75fa61 [formerly c32bb9556e [formerly 46c434a450902cfb87fb3b1678bcf841f4d77a95]]
Former-commit-id: c32bb9556e
Former-commit-id: a56cc7060b
|
2012-07-14 08:51:00 -05:00 |
|
Bryan Kowal
|
81dd57d347
|
Issue #802 - the baseline build (enhanced by WA8) will now correctly update the edex banner and cave about dialog. Improved how the edex banner is written.
Former-commit-id: 1e5b71ee7b [formerly db6b535eb6 [formerly d70a752ea80b6e0ded2270da8d54525ae6fbf0da]]
Former-commit-id: db6b535eb6
Former-commit-id: b446253674
|
2012-07-12 12:58:40 -05:00 |
|
Bryan Kowal
|
85dab34a39
|
Issue #777 - removing the few remaining references to the WORKSPACE_DIR environment variable and the Installer.rpm directory. Ensure that
the build builds awips2-data.gfe.
Former-commit-id: c7a172f97a [formerly b79f5a3c2b [formerly 38fd864d20cc5830b0f3913faf9b66cbf0f10048]]
Former-commit-id: b79f5a3c2b
Former-commit-id: 0e279845ba
|
2012-07-11 09:42:46 -05:00 |
|
Bryan Kowal
|
2acacb211a
|
Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
Former-commit-id: f92eb59a73 [formerly 99d22f395a [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]]
Former-commit-id: 99d22f395a
Former-commit-id: c629f18f24
|
2012-07-10 16:57:16 -05:00 |
|