Richard Peter
345dfd2ca9
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: 3fb7d96ec11dbb34523b
2013-01-14 18:07:17 -06:00
Steve Harris
8713dfc5ca
13.2.1-1 baseline
...
Former-commit-id: e62172c8c781849e3cbb
2013-01-14 18:42:21 -05:00
Richard Peter
6a5a0d7d09
Issue #1408 : Merge 13.1.2-6 into development
...
Former-commit-id: 029ebaa63a328be6ac2b
2013-01-09 17:55:05 -06:00
Steve Harris
dbcae57f57
13.1.2-6 baseline
...
Former-commit-id: 8e5f9e0e6c59969775ad
2013-01-06 14:55:11 -06:00
Steve Harris
941337c553
13.1.2-2 baseline
...
Former-commit-id: c0c1d56f3a4ba416aeb3
2013-01-06 14:32:24 -06:00
Roger Ferrel
6d4946290f
Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly.
...
Change-Id: I1f9f5b25d833c14031b9eb257c175de81bc146dc
Former-commit-id: 0c5d10e66a43fd607a30
2012-12-18 09:00:46 -06:00
Bryan Kowal
c44c4bd061
Issue #1262 :
...
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib
- Updated build-notification.sh for compatibility with automated builds
Change-Id: I4d014e64a014010caa6a89e17ff3edb44000d396
Former-commit-id: 660a9b615ff39489c44c
2012-12-16 21:40:26 -06:00
Richard Peter
48641ca26f
Revert "Issue #1262:"
...
This reverts commit 94906521030970259114a210f08acc9a7cfa2383f37f948456
2012-12-16 20:37:21 -06:00
Bryan Kowal
9490652103
Issue #1262 :
...
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib
Former-commit-id: a210f08acc0970259114
2012-12-13 12:40:31 -06:00
Roger Ferrel
f64a99d554
Issue #1411 Change suggest by Dale Morris for pqact.conf.template.
...
Change-Id: I9101cb4eab47a82f64212f457d7e0eea11479cc4
Former-commit-id: b677a5ba3daefa650cda
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: 43ddfe98c4f6988eefff
2012-12-11 08:45:53 -06:00
Steve Harris
7bb37caa23
12.12.1-12 baseline
...
Former-commit-id: e8e41630e86d610f8e8a
2012-12-06 09:18:28 -06:00
Steve Harris
ee06a94735
12.12.1-8 baseline
...
Former-commit-id: 19962f41ba5093a7c442
2012-12-06 09:02:51 -06:00
Bryan Kowal
67c3c140e3
Issue #1318 - updated ncep database rpm specification file
...
Change-Id: Ie4b5ef9b76ce96e21e68f40ffc194cb584a1e832
Former-commit-id: b60dda550cfe9dcaa216
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: 99399e880e24074da383
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: bff32bbe580d1d663f41
2012-11-14 14:41:57 -06:00
Steve Harris
628ca9e5c6
12.12.1-4 baseline
...
Former-commit-id: 85130eb61157578da521
2012-11-14 14:19:20 -06:00
Steve Harris
c8cac52915
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 448dd1c35f00f3d51546
2012-11-13 17:28:50 -06:00
Steve Harris
df89fe9bed
12.12.1-2 baseline
...
Former-commit-id: a8560580f86868eb9b23
2012-11-13 17:14:24 -06:00
Steve Harris
214fcd3b63
12.12.1-1 baseline
...
Former-commit-id: e4bd20a515e1498006c7
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: 98d7beae5031d7d09c10
2012-11-01 13:36:06 -05:00
Steve Harris
9d038186d1
Merge branch 'ss_builds' (12.11.1-7) into development
...
Former-commit-id: b7406a55cc38b9c03f5e
2012-10-23 16:43:09 -05:00
Steve Harris
cfd228f0d7
12.11.1-7 baseline
...
Former-commit-id: d8ca6b900579a5638de9
2012-10-23 16:40:50 -05:00
Richard Peter
c7894c5cda
Merge "Issue #1265 remove pypies gzip handling" into development
...
Former-commit-id: 3723250e50cd9306a537
2012-10-17 14:07:28 -05:00
Nate Jensen
740146d838
Issue #1265 remove pypies gzip handling
...
Change-Id: Ia79c1b7b2440849893bacf5cd8290fb5627ed4e5
Former-commit-id: fa3e87549a2dac2f5dde
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: a63b40b17a5e5c98b193
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: 4610ecc513751563e331
2012-10-16 15:48:14 -05:00
Steve Harris
cbbdb231ce
12.11.1-4 baseline
...
Former-commit-id: d3497e47eb6958b861f0
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: d1772b3705b8de817d68
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: f2cbf0c5c38e4a7ec406
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: aca18f0a37fd783767b2
2012-10-12 14:48:59 -05:00
James Korman
4ce298e736
Issue #1252 - Updated with changes from Dale Morris
...
Former-commit-id: 2fad414d6d20c61590a4
2012-10-12 14:48:59 -05:00
Steven Harris
8843ffd022
12.11.1-1 baseline
...
Former-commit-id: 618aa3f316feec28f274
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: 8354ca4e683827a78a7b
2012-09-25 10:31:57 -05:00
Steve Harris
5d5a61bd75
12.10.1-6 baseline
...
Former-commit-id: cebe6534aeba648f8e72
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: 29e7427dc304d9735c8f
2012-09-13 13:26:13 -05:00
Steve Harris
2ba58a3576
12.10.1-4 baseline
...
Former-commit-id: fd19ca562449c3861597
2012-09-13 12:08:11 -05:00
Steve Harris
438d139fdd
12.10.1-3 baseline
...
Former-commit-id: 21f430062b969e7e6dfd
2012-09-11 16:00:38 -05:00
James Korman
f36d089fd5
Issue #1090 - pattern corrections
...
Former-commit-id: be350dd763eb17151f74
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: 137b27d3ff3e1556a981
2012-09-05 14:44:36 -05:00
Steve Harris
3230e0b246
Merge branch 'ss_builds' (12.9.1-11) into development
...
Conflicts:
rpms/build/i386/build.sh
Former-commit-id: 3a9d4961e234cbde4124
2012-08-30 14:40:34 -05:00
Steve Harris
dc08c5a71a
12.9.1-10 baseline
...
Former-commit-id: 3adc50a783cb9b80f3a0
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: d38f8b80f044a7cb75e7
2012-08-21 16:17:58 -05:00
Steve Harris
72824561cb
12.9.1-5 baseline
...
Former-commit-id: 61f269f54cf2fac39428
2012-08-21 15:27:03 -05:00
root
8a66b2f209
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: cb46f578795a453ee984
2012-08-15 22:15:20 +00:00
Steve Harris
edbbacfa8a
12.9.1-3 baseline
...
Former-commit-id: 36d80b1f6084bbf2573e
2012-08-15 14:26:10 -05:00
Steve Harris
0c5d9e2416
12.9.1-1 baseline
...
Former-commit-id: 31ae7ea21879ce6cfd97
2012-08-15 13:59:00 -05:00
Steve Harris
8f4ddad22c
Merge branch 'development' into development_on_ss_builds
...
Former-commit-id: 24799cd93da1071e3204
2012-08-06 08:23: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: 6d77b9421751e38ca887
2012-08-01 12:43:12 -05:00
Bryan Kowal
024a23e7a3
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: 485334331ad07281ac51
2012-08-01 11:50:24 -05:00
