Roger Ferrel
|
f64a99d554
|
Issue #1411 Change suggest by Dale Morris for pqact.conf.template.
Change-Id: I9101cb4eab47a82f64212f457d7e0eea11479cc4
Former-commit-id: b677a5ba3d [formerly b406c990607a06678a58e36118edcddaab073b26]
Former-commit-id: aefa650cda
|
2012-12-11 15:43:54 -06:00 |
|
Steve Harris
|
6287b32e7d
|
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: 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]
Former-commit-id: f6988eefff
|
2012-12-11 08:45:53 -06:00 |
|
Bryan Kowal
|
43f888ccb8
|
Issue #1392 - update tar directory access paths for awips2-edex-native
Former-commit-id: 73e0f4b278 [formerly 65d91d9235a76c5ee82450d3dd6332f92e29c326]
Former-commit-id: 6ff82d812e
|
2012-12-05 10:15:37 -06:00 |
|
Bryan Kowal
|
b0c65323b6
|
Issue #1354 - 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: d3b455c955 [formerly ca0b97b8d8db19900107ab38f6a6af8a9ee7b935]
Former-commit-id: f99d351995
|
2012-11-28 16:30:10 -06:00 |
|
Bryan Kowal
|
67c3c140e3
|
Issue #1318 - updated ncep database rpm specification file
Change-Id: Ie4b5ef9b76ce96e21e68f40ffc194cb584a1e832
Former-commit-id: b60dda550c [formerly b3f1b857e5a8efcfea0f5b8985eddd5992724d89]
Former-commit-id: fe9dcaa216
|
2012-11-15 10:24:38 -06:00 |
|
Bryan Kowal
|
3d123e08a7
|
Issue #1318 - updated ncep database rpm specification file
Change-Id: Iac80537a3fcc7998f93d5a3db9e842d7eea141d9
Former-commit-id: 99399e880e [formerly f433daa8ffe59da91acba71ac5893d77ad810404]
Former-commit-id: 24074da383
|
2012-11-15 09:26:46 -06:00 |
|
Dustin Johnson
|
e25b7c312b
|
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: bff32bbe58 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]
Former-commit-id: 0d1d663f41
|
2012-11-14 14:41:57 -06:00 |
|
Steve Harris
|
628ca9e5c6
|
12.12.1-4 baseline
Former-commit-id: 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]
Former-commit-id: 57578da521
|
2012-11-14 14:19:20 -06:00 |
|
Steve Harris
|
c8cac52915
|
Merge branch 'ss_builds' (12.12.1-3) into development
Former-commit-id: 448dd1c35f [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]
Former-commit-id: 00f3d51546
|
2012-11-13 17:28:50 -06:00 |
|
Steve Harris
|
df89fe9bed
|
12.12.1-2 baseline
Former-commit-id: a8560580f8 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]
Former-commit-id: 6868eb9b23
|
2012-11-13 17:14:24 -06:00 |
|
Steve Harris
|
214fcd3b63
|
12.12.1-1 baseline
Former-commit-id: e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]
Former-commit-id: e1498006c7
|
2012-11-07 12:41:20 -06:00 |
|
Dustin Johnson
|
bcf575966b
|
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: 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]
Former-commit-id: 31d7d09c10
|
2012-11-01 13:36:06 -05:00 |
|
Steve Harris
|
048c0c88cd
|
Merge branch 'ss_builds' into development
Former-commit-id: fb46bb053d [formerly 791639aecd4c192b4bb8d8bb692f2c696cde1daa]
Former-commit-id: afb534db67
|
2012-10-29 12:17:12 -05:00 |
|
Steve Harris
|
314c03e7b6
|
12.11.1-12 baseline
Former-commit-id: 8682e4f6ca [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]
Former-commit-id: 9ff9cb8aa3
|
2012-10-29 12:15:56 -05:00 |
|
Steve Harris
|
9d038186d1
|
Merge branch 'ss_builds' (12.11.1-7) into development
Former-commit-id: b7406a55cc [formerly 92fcd9f3f15f3bbd49934ea04e4fb6e02c4b8684]
Former-commit-id: 38b9c03f5e
|
2012-10-23 16:43:09 -05:00 |
|
Steve Harris
|
cfd228f0d7
|
12.11.1-7 baseline
Former-commit-id: d8ca6b9005 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]
Former-commit-id: 79a5638de9
|
2012-10-23 16:40:50 -05:00 |
|
Steve Harris
|
892e4df811
|
Merge branch 'ss_builds' (12.11.1-6) into development
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: a7337d9160 [formerly de600d1a0e309ddbb4838526a9f92af05282cd1a]
Former-commit-id: 1807100932
|
2012-10-18 16:01:05 -05:00 |
|
Steve Harris
|
08fc9f6b14
|
12.11.1-6 baseline
Former-commit-id: fba4a443a0 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]
Former-commit-id: 5c1f3cdc46
|
2012-10-18 15:53:01 -05:00 |
|
Steve Harris
|
e31c1e5bba
|
12.11.1-5 baseline
Former-commit-id: 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]
Former-commit-id: a0eaf651ff
|
2012-10-18 15:46:42 -05:00 |
|
Richard Peter
|
c7894c5cda
|
Merge "Issue #1265 remove pypies gzip handling" into development
Former-commit-id: 3723250e50 [formerly fd47306a1247721d53b227bf94cc94818b4efc39]
Former-commit-id: cd9306a537
|
2012-10-17 14:07:28 -05:00 |
|
Nate Jensen
|
740146d838
|
Issue #1265 remove pypies gzip handling
Change-Id: Ia79c1b7b2440849893bacf5cd8290fb5627ed4e5
Former-commit-id: fa3e87549a [formerly 6bb4d39b266bedbecff6ecda95bf05e65aa1e58c]
Former-commit-id: 2dac2f5dde
|
2012-10-17 11:32:49 -05:00 |
|
Steve Harris
|
be16909d2d
|
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: a63b40b17a [formerly ecb6a8876078dcff3414ff2a33aa14bf130fa075]
Former-commit-id: 5e5c98b193
|
2012-10-16 21:44:49 -05:00 |
|
Steve Harris
|
0c0c1144c6
|
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: 4610ecc513 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]
Former-commit-id: 751563e331
|
2012-10-16 15:48:14 -05:00 |
|
Steve Harris
|
cbbdb231ce
|
12.11.1-4 baseline
Former-commit-id: d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]
Former-commit-id: 6958b861f0
|
2012-10-16 13:27:07 -05:00 |
|
Greg Armendariz
|
2c058c6b8a
|
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: d1772b3705 [formerly ab6631a9b47cb5bc6716bc3ba9805bd40665f785]
Former-commit-id: b8de817d68
|
2012-10-16 12:59:00 -05:00 |
|
Nate Jensen
|
5bdf9d4d38
|
Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae
Former-commit-id: f2cbf0c5c3 [formerly 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1]
Former-commit-id: 8e4a7ec406
|
2012-10-12 15:16:27 -05:00 |
|
James Korman
|
31be9c204d
|
Issue #1252 - Checked in wrong file. Deleting it.
Change-Id: Ibe8b9a9708e37f7e697e7133b98d24a0060ebd37
Former-commit-id: aca18f0a37 [formerly a9e332dd585910aa6094d30c3e883451fb0df237]
Former-commit-id: fd783767b2
|
2012-10-12 14:48:59 -05:00 |
|
James Korman
|
4ce298e736
|
Issue #1252 - Updated with changes from Dale Morris
Former-commit-id: 2fad414d6d [formerly f48f637e60f7537da42681dc001332257a046d2b]
Former-commit-id: 20c61590a4
|
2012-10-12 14:48:59 -05:00 |
|
Steve Harris
|
8dae024430
|
Merge branch 'ss_builds' (12.11.1-2) into development
Change-Id: I4d3416f5f91d7955dd8eb274cd536563862e2b73
Former-commit-id: 8c97afe03b [formerly 1a255600a5e909dc4189e9c88d0735157a400a1d]
Former-commit-id: 0895f22690
|
2012-10-08 13:29:34 -05:00 |
|
Steve Harris
|
42bf60b2fc
|
12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: c12ee14e66 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]
Former-commit-id: 1e02387ff1
|
2012-10-08 13:26:20 -05:00 |
|
Steve Harris
|
a94cb4c7bd
|
Issue #1250 - Modified the comp.xml files adding kml-export
Change-Id: I53bcbf3199013f02db1ea83c5e665912d6232761
Former-commit-id: d0c760764f [formerly 252fbc2ff9e34300c2176a6c149c3af9a523321c]
Former-commit-id: 9552a60f54
|
2012-10-05 10:06:16 -05:00 |
|
Steven Harris
|
8843ffd022
|
12.11.1-1 baseline
Former-commit-id: 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]
Former-commit-id: feec28f274
|
2012-09-27 15:57:45 -05:00 |
|
Steve Harris
|
f5f59b6aa5
|
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: 8354ca4e68 [formerly 4ebdc29db766db49df46d568a320c1743d0bb7c0]
Former-commit-id: 3827a78a7b
|
2012-09-25 10:31:57 -05:00 |
|
Steve Harris
|
5d5a61bd75
|
12.10.1-6 baseline
Former-commit-id: cebe6534ae [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]
Former-commit-id: ba648f8e72
|
2012-09-25 10:14:23 -05:00 |
|
Steve Harris
|
53673f63e6
|
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: 29e7427dc3 [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]
Former-commit-id: 04d9735c8f
|
2012-09-13 13:26:13 -05:00 |
|
Steve Harris
|
2ba58a3576
|
12.10.1-4 baseline
Former-commit-id: fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]
Former-commit-id: 49c3861597
|
2012-09-13 12:08:11 -05:00 |
|
Steve Harris
|
438d139fdd
|
12.10.1-3 baseline
Former-commit-id: 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]
Former-commit-id: 969e7e6dfd
|
2012-09-11 16:00:38 -05:00 |
|
Greg Armendariz
|
338f0ebd91
|
Merge "Issue #1090 - pattern corrections" into development
Former-commit-id: 8201f5346f [formerly 9dc5230757d9a09f718fdf1f802e698ac6dd21d2]
Former-commit-id: 58b74d05e5
|
2012-09-06 13:50:36 -05:00 |
|
Steve Harris
|
b9317a53c7
|
Issue #1141 - Adding JavaAPIforKml license file
Former-commit-id: 7d7f20b388 [formerly d84394c2f8f62406fee0e039ba0aa283bbbd857e]
Former-commit-id: 259bb4dfed
|
2012-09-06 11:09:24 -05:00 |
|
James Korman
|
f36d089fd5
|
Issue #1090 - pattern corrections
Former-commit-id: be350dd763 [formerly 7849341873013b71b6fe5f01ae3fe274bfc7e8a7]
Former-commit-id: eb17151f74
|
2012-09-06 09:20:03 -05:00 |
|
Bryan Kowal
|
a34225c4c9
|
Issue #1130 - merging Wes2Bridge into Common Baseline Delivery II (cherry pick)
Former-commit-id: 137b27d3ff [formerly 9a0cd58382909965a6c44cf05fec28eb69835a26]
Former-commit-id: 3e1556a981
|
2012-09-05 14:44:36 -05:00 |
|
Steve Harris
|
53e29f59e4
|
Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]
Former-commit-id: af106f1d29
|
2012-09-04 12:11:03 -05:00 |
|
Steve Harris
|
7bd9c63dc7
|
12.10.1-1 baseline
Former-commit-id: 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]
Former-commit-id: d708932029
|
2012-09-04 12:07:27 -05:00 |
|
Steve Harris
|
9311c1737e
|
12.9.1-12 baseline
Former-commit-id: 948766c387 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]
Former-commit-id: 150bc967a5
|
2012-09-04 11:47:38 -05:00 |
|
Steve Harris
|
3230e0b246
|
Merge branch 'ss_builds' (12.9.1-11) into development
Conflicts:
rpms/build/i386/build.sh
Former-commit-id: 3a9d4961e2 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]
Former-commit-id: 34cbde4124
|
2012-08-30 14:40:34 -05:00 |
|
Steve Harris
|
dc08c5a71a
|
12.9.1-10 baseline
Former-commit-id: 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]
Former-commit-id: cb9b80f3a0
|
2012-08-30 14:28:27 -05:00 |
|
Steve Harris
|
77369f78a6
|
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: d38f8b80f0 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]
Former-commit-id: 44a7cb75e7
|
2012-08-21 16:17:58 -05:00 |
|
Steve Harris
|
72824561cb
|
12.9.1-5 baseline
Former-commit-id: 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: f2fac39428
|
2012-08-21 15:27:03 -05:00 |
|
Bryan Kowal
|
69a16eb369
|
Remove the usage of the old method to build the edex ost rpm.
Former-commit-id: 44328f1702 [formerly 6fb431fe7f0204e8acc1e8263800c41aa5974bd9]
Former-commit-id: 01e7976a52
|
2012-08-16 14:27:11 -05: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 |
|