Commit graph

189 commits

Author SHA1 Message Date
Bryan Kowal
24074da383 Issue #1318 - updated ncep database rpm specification file
Change-Id: Iac80537a3fcc7998f93d5a3db9e842d7eea141d9

Former-commit-id: f433daa8ffe59da91acba71ac5893d77ad810404
2012-11-15 09:26:46 -06:00
Dustin Johnson
0d1d663f41 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: 2f676ffcab1c9efa612a52283d05e56f9c748569
2012-11-14 14:41:57 -06:00
Steve Harris
57578da521 12.12.1-4 baseline
Former-commit-id: 4a7e3fabdef8d948216483965c1f62e5216bf362
2012-11-14 14:19:20 -06:00
Steve Harris
00f3d51546 Merge branch 'ss_builds' (12.12.1-3) into development
Former-commit-id: 7a44f29952ec89991e578c67357e1ef3f3c51d59
2012-11-13 17:28:50 -06:00
Steve Harris
6868eb9b23 12.12.1-2 baseline
Former-commit-id: 90019fdb91dad949f125e46de9300ccd44f6e315
2012-11-13 17:14:24 -06:00
Steve Harris
e1498006c7 12.12.1-1 baseline
Former-commit-id: 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535
2012-11-07 12:41:20 -06:00
Dustin Johnson
31d7d09c10 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: 89583d97c8823818f87dc1a234078d85ba7bea4a
2012-11-01 13:36:06 -05:00
Steve Harris
afb534db67 Merge branch 'ss_builds' into development
Former-commit-id: 791639aecd4c192b4bb8d8bb692f2c696cde1daa
2012-10-29 12:17:12 -05:00
Steve Harris
9ff9cb8aa3 12.11.1-12 baseline
Former-commit-id: 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f
2012-10-29 12:15:56 -05:00
Steve Harris
38b9c03f5e Merge branch 'ss_builds' (12.11.1-7) into development
Former-commit-id: 92fcd9f3f15f3bbd49934ea04e4fb6e02c4b8684
2012-10-23 16:43:09 -05:00
Steve Harris
79a5638de9 12.11.1-7 baseline
Former-commit-id: 59b9a93267bcf7b82fdefc55784289f7510117d0
2012-10-23 16:40:50 -05:00
Steve Harris
1807100932 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: de600d1a0e309ddbb4838526a9f92af05282cd1a
2012-10-18 16:01:05 -05:00
Steve Harris
5c1f3cdc46 12.11.1-6 baseline
Former-commit-id: 18939af3b7cf54a36970d65d528003f4fe489eb7
2012-10-18 15:53:01 -05:00
Steve Harris
a0eaf651ff 12.11.1-5 baseline
Former-commit-id: a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7
2012-10-18 15:46:42 -05:00
Richard Peter
cd9306a537 Merge "Issue #1265 remove pypies gzip handling" into development
Former-commit-id: fd47306a1247721d53b227bf94cc94818b4efc39
2012-10-17 14:07:28 -05:00
Nate Jensen
2dac2f5dde Issue #1265 remove pypies gzip handling
Change-Id: Ia79c1b7b2440849893bacf5cd8290fb5627ed4e5

Former-commit-id: 6bb4d39b266bedbecff6ecda95bf05e65aa1e58c
2012-10-17 11:32:49 -05:00
Steve Harris
5e5c98b193 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: ecb6a8876078dcff3414ff2a33aa14bf130fa075
2012-10-16 21:44:49 -05:00
Steve Harris
751563e331 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: 07beab271f793ae79fcf9233f9d384702ead22a9
2012-10-16 15:48:14 -05:00
Steve Harris
6958b861f0 12.11.1-4 baseline
Former-commit-id: dddf20c9518c578d1bebd0b5e01b10c5080fd24e
2012-10-16 13:27:07 -05:00
Greg Armendariz
b8de817d68 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: ab6631a9b47cb5bc6716bc3ba9805bd40665f785
2012-10-16 12:59:00 -05:00
Nate Jensen
8e4a7ec406 Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae

Former-commit-id: 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1
2012-10-12 15:16:27 -05:00
James Korman
fd783767b2 Issue #1252 - Checked in wrong file. Deleting it.
Change-Id: Ibe8b9a9708e37f7e697e7133b98d24a0060ebd37

Former-commit-id: a9e332dd585910aa6094d30c3e883451fb0df237
2012-10-12 14:48:59 -05:00
James Korman
20c61590a4 Issue #1252 - Updated with changes from Dale Morris
Former-commit-id: f48f637e60f7537da42681dc001332257a046d2b
2012-10-12 14:48:59 -05:00
Steve Harris
0895f22690 Merge branch 'ss_builds' (12.11.1-2) into development
Change-Id: I4d3416f5f91d7955dd8eb274cd536563862e2b73

Former-commit-id: 1a255600a5e909dc4189e9c88d0735157a400a1d
2012-10-08 13:29:34 -05:00
Steve Harris
1e02387ff1 12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

Former-commit-id: da126f587a1e3761dbe16ee2a41aee0caba85bfc
2012-10-08 13:26:20 -05:00
Steve Harris
9552a60f54 Issue #1250 - Modified the comp.xml files adding kml-export
Change-Id: I53bcbf3199013f02db1ea83c5e665912d6232761

Former-commit-id: 252fbc2ff9e34300c2176a6c149c3af9a523321c
2012-10-05 10:06:16 -05:00
Steven Harris
feec28f274 12.11.1-1 baseline
Former-commit-id: 765055b5332ddace3cec2d07e279652de869cfe4
2012-09-27 15:57:45 -05:00
Steve Harris
3827a78a7b 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: 4ebdc29db766db49df46d568a320c1743d0bb7c0
2012-09-25 10:31:57 -05:00
Steve Harris
ba648f8e72 12.10.1-6 baseline
Former-commit-id: b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc
2012-09-25 10:14:23 -05:00
Steve Harris
04d9735c8f 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: 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb
2012-09-13 13:26:13 -05:00
Steve Harris
49c3861597 12.10.1-4 baseline
Former-commit-id: 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed
2012-09-13 12:08:11 -05:00
Steve Harris
969e7e6dfd 12.10.1-3 baseline
Former-commit-id: 1a94c1ca3674c8e4dbb8847de5190efe33da371c
2012-09-11 16:00:38 -05:00
Greg Armendariz
58b74d05e5 Merge "Issue #1090 - pattern corrections" into development
Former-commit-id: 9dc5230757d9a09f718fdf1f802e698ac6dd21d2
2012-09-06 13:50:36 -05:00
Steve Harris
259bb4dfed Issue #1141 - Adding JavaAPIforKml license file
Former-commit-id: d84394c2f8f62406fee0e039ba0aa283bbbd857e
2012-09-06 11:09:24 -05:00
James Korman
eb17151f74 Issue #1090 - pattern corrections
Former-commit-id: 7849341873013b71b6fe5f01ae3fe274bfc7e8a7
2012-09-06 09:20:03 -05:00
Bryan Kowal
3e1556a981 Issue #1130 - merging Wes2Bridge into Common Baseline Delivery II (cherry pick)
Former-commit-id: 9a0cd58382909965a6c44cf05fec28eb69835a26
2012-09-05 14:44:36 -05:00
Steve Harris
af106f1d29 Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: 3eacf0da611b09faa416580b8d2db5bdc9af2d11
2012-09-04 12:11:03 -05:00
Steve Harris
d708932029 12.10.1-1 baseline
Former-commit-id: 7d17407c5b0a4a3f9b4b083891a5a5975c645810
2012-09-04 12:07:27 -05:00
Steve Harris
150bc967a5 12.9.1-12 baseline
Former-commit-id: 09035ea929c2e926b2dce13429c29d3fd3707880
2012-09-04 11:47:38 -05:00
Steve Harris
34cbde4124 Merge branch 'ss_builds' (12.9.1-11) into development
Conflicts:
	rpms/build/i386/build.sh

Former-commit-id: 73ab8bdcc39291fbe36b5bcffe53d9106cc00238
2012-08-30 14:40:34 -05:00
Steve Harris
cb9b80f3a0 12.9.1-10 baseline
Former-commit-id: 32048810bc091d7ba09a321c36cd5a78b2d4bd39
2012-08-30 14:28:27 -05:00
Steve Harris
44a7cb75e7 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: 6d33469c48d659279c02e5e9489b67b00576381a
2012-08-21 16:17:58 -05:00
Steve Harris
f2fac39428 12.9.1-5 baseline
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
2012-08-21 15:27:03 -05:00
Bryan Kowal
01e7976a52 Remove the usage of the old method to build the edex ost rpm.
Former-commit-id: 6fb431fe7f0204e8acc1e8263800c41aa5974bd9
2012-08-16 14:27:11 -05:00
root
5a453ee984 Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: a178af491f4b4cd75ed1517f023354bab0b9c8c8
2012-08-15 22:15:20 +00:00
Steve Harris
33b95fb96d 12.9.1-4 baseline
Former-commit-id: df38541c9df38c634626ae214f288b606004a768
2012-08-15 15:19:10 -05:00
Steve Harris
84bbf2573e 12.9.1-3 baseline
Former-commit-id: 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86
2012-08-15 14:26:10 -05:00
Steve Harris
79ce6cfd97 12.9.1-1 baseline
Former-commit-id: 6601ddb09c2928754c2c3859dac284998d73ff81
2012-08-15 13:59:00 -05:00
Steve Harris
85f82b18b3 Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds
Conflicts:
	rpms/awips2.64/Installer.h5py/component.spec

Former-commit-id: f6fc0581c3100ef186b90668cb1f1ae4283eaa7b
2012-08-06 09:38:26 -05:00
Steve Harris
ca25d508ec 12.8.1-10 baseline
Former-commit-id: 7c799ab7b99993c77b6568529b46aaf13d01300b
2012-08-06 09:34:26 -05:00