Steve Harris
|
6f16b46b8d
|
Merge branch 'ss_builds' into development
Former-commit-id: 340ce53e22 [formerly fb46bb053d] [formerly 340ce53e22 [formerly fb46bb053d] [formerly afb534db67 [formerly 791639aecd4c192b4bb8d8bb692f2c696cde1daa]]]
Former-commit-id: afb534db67
Former-commit-id: e211bfc043 [formerly 048c0c88cd]
Former-commit-id: e9e3bdbec2
|
2012-10-29 12:17:12 -05:00 |
|
Steve Harris
|
a9e1b01ad7
|
12.11.1-12 baseline
Former-commit-id: 565756567f [formerly 8682e4f6ca] [formerly 565756567f [formerly 8682e4f6ca] [formerly 9ff9cb8aa3 [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]]
Former-commit-id: 9ff9cb8aa3
Former-commit-id: d8b6157aab [formerly 314c03e7b6]
Former-commit-id: 09f6e43195
|
2012-10-29 12:15:56 -05:00 |
|
Steve Harris
|
8d94eb1e59
|
Merge branch 'ss_builds' (12.11.1-7) into development
Former-commit-id: d42e8373c6 [formerly b7406a55cc] [formerly d42e8373c6 [formerly b7406a55cc] [formerly 38b9c03f5e [formerly 92fcd9f3f15f3bbd49934ea04e4fb6e02c4b8684]]]
Former-commit-id: 38b9c03f5e
Former-commit-id: ae9c6d58dd [formerly 9d038186d1]
Former-commit-id: 20e87549c0
|
2012-10-23 16:43:09 -05:00 |
|
Steve Harris
|
26badd258f
|
12.11.1-7 baseline
Former-commit-id: 40a5bc1683 [formerly d8ca6b9005] [formerly 40a5bc1683 [formerly d8ca6b9005] [formerly 79a5638de9 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]]]
Former-commit-id: 79a5638de9
Former-commit-id: efba080b9c [formerly cfd228f0d7]
Former-commit-id: 572085c119
|
2012-10-23 16:40:50 -05:00 |
|
Steve Harris
|
35c2a8e26f
|
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: 3eff876edd [formerly a7337d9160] [formerly 3eff876edd [formerly a7337d9160] [formerly 1807100932 [formerly de600d1a0e309ddbb4838526a9f92af05282cd1a]]]
Former-commit-id: 1807100932
Former-commit-id: 8486da2fd3 [formerly 892e4df811]
Former-commit-id: 8a17564ba3
|
2012-10-18 16:01:05 -05:00 |
|
Steve Harris
|
9c597c7060
|
12.11.1-6 baseline
Former-commit-id: 30c786a885 [formerly fba4a443a0] [formerly 30c786a885 [formerly fba4a443a0] [formerly 5c1f3cdc46 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 8beb6fc0b8 [formerly 08fc9f6b14]
Former-commit-id: 4f27cbb406
|
2012-10-18 15:53:01 -05:00 |
|
Steve Harris
|
13cdd55545
|
12.11.1-5 baseline
Former-commit-id: 362d6ffaca [formerly 03f3f3c36a] [formerly 362d6ffaca [formerly 03f3f3c36a] [formerly a0eaf651ff [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]]
Former-commit-id: a0eaf651ff
Former-commit-id: 85ad066b70 [formerly e31c1e5bba]
Former-commit-id: dff8d5de9c
|
2012-10-18 15:46:42 -05:00 |
|
Richard Peter
|
1f5b91885d
|
Merge "Issue #1265 remove pypies gzip handling" into development
Former-commit-id: 935ddb3224 [formerly 3723250e50] [formerly 935ddb3224 [formerly 3723250e50] [formerly cd9306a537 [formerly fd47306a1247721d53b227bf94cc94818b4efc39]]]
Former-commit-id: cd9306a537
Former-commit-id: aa26b2a623 [formerly c7894c5cda]
Former-commit-id: 88b80f406d
|
2012-10-17 14:07:28 -05:00 |
|
Nate Jensen
|
853d433117
|
Issue #1265 remove pypies gzip handling
Change-Id: Ia79c1b7b2440849893bacf5cd8290fb5627ed4e5
Former-commit-id: 7874be59e7 [formerly fa3e87549a] [formerly 7874be59e7 [formerly fa3e87549a] [formerly 2dac2f5dde [formerly 6bb4d39b266bedbecff6ecda95bf05e65aa1e58c]]]
Former-commit-id: 2dac2f5dde
Former-commit-id: 9dac98930f [formerly 740146d838]
Former-commit-id: 60ad3b55f2
|
2012-10-17 11:32:49 -05:00 |
|
Steve Harris
|
b7a76beea6
|
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 4ffbffe349 [formerly a63b40b17a] [formerly 4ffbffe349 [formerly a63b40b17a] [formerly 5e5c98b193 [formerly ecb6a8876078dcff3414ff2a33aa14bf130fa075]]]
Former-commit-id: 5e5c98b193
Former-commit-id: a3a79a1a82 [formerly be16909d2d]
Former-commit-id: b28a8e5113
|
2012-10-16 21:44:49 -05:00 |
|
Steve Harris
|
1e4c737ff2
|
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: da7a11fe97 [formerly 4610ecc513] [formerly da7a11fe97 [formerly 4610ecc513] [formerly 751563e331 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]]
Former-commit-id: 751563e331
Former-commit-id: d0e91329b4 [formerly 0c0c1144c6]
Former-commit-id: ad78266035
|
2012-10-16 15:48:14 -05:00 |
|
Steve Harris
|
35e34308c5
|
12.11.1-4 baseline
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: 2c82d9cb07 [formerly cbbdb231ce]
Former-commit-id: 560f0d9cc3
|
2012-10-16 13:27:07 -05:00 |
|
Greg Armendariz
|
1b318ab0f6
|
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: 2d18d5791a [formerly d1772b3705] [formerly 2d18d5791a [formerly d1772b3705] [formerly b8de817d68 [formerly ab6631a9b47cb5bc6716bc3ba9805bd40665f785]]]
Former-commit-id: b8de817d68
Former-commit-id: 1c5bebe6a9 [formerly 2c058c6b8a]
Former-commit-id: 041b833d53
|
2012-10-16 12:59:00 -05:00 |
|
Nate Jensen
|
1efcd36987
|
Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae
Former-commit-id: cbc2da0c06 [formerly f2cbf0c5c3] [formerly cbc2da0c06 [formerly f2cbf0c5c3] [formerly 8e4a7ec406 [formerly 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1]]]
Former-commit-id: 8e4a7ec406
Former-commit-id: 93143bbda0 [formerly 5bdf9d4d38]
Former-commit-id: 319c4cda2b
|
2012-10-12 15:16:27 -05:00 |
|
James Korman
|
8074a49529
|
Issue #1252 - Checked in wrong file. Deleting it.
Change-Id: Ibe8b9a9708e37f7e697e7133b98d24a0060ebd37
Former-commit-id: c2a4c48f5d [formerly aca18f0a37] [formerly c2a4c48f5d [formerly aca18f0a37] [formerly fd783767b2 [formerly a9e332dd585910aa6094d30c3e883451fb0df237]]]
Former-commit-id: fd783767b2
Former-commit-id: 83bd2e28c4 [formerly 31be9c204d]
Former-commit-id: 5659c72222
|
2012-10-12 14:48:59 -05:00 |
|
James Korman
|
e41cb57aac
|
Issue #1252 - Updated with changes from Dale Morris
Former-commit-id: 6d5df727e5 [formerly 2fad414d6d] [formerly 6d5df727e5 [formerly 2fad414d6d] [formerly 20c61590a4 [formerly f48f637e60f7537da42681dc001332257a046d2b]]]
Former-commit-id: 20c61590a4
Former-commit-id: b306b6bd0a [formerly 4ce298e736]
Former-commit-id: add08a1c0d
|
2012-10-12 14:48:59 -05:00 |
|
Steve Harris
|
198eca2a6c
|
Merge branch 'ss_builds' (12.11.1-2) into development
Change-Id: I4d3416f5f91d7955dd8eb274cd536563862e2b73
Former-commit-id: 7be572b27d [formerly 8c97afe03b] [formerly 7be572b27d [formerly 8c97afe03b] [formerly 0895f22690 [formerly 1a255600a5e909dc4189e9c88d0735157a400a1d]]]
Former-commit-id: 0895f22690
Former-commit-id: 48a80a23e4 [formerly 8dae024430]
Former-commit-id: 8c81601905
|
2012-10-08 13:29:34 -05:00 |
|
Steve Harris
|
ff9321e3ce
|
12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: 75901860c2 [formerly c12ee14e66] [formerly 75901860c2 [formerly c12ee14e66] [formerly 1e02387ff1 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]]
Former-commit-id: 1e02387ff1
Former-commit-id: 772c60efa4 [formerly 42bf60b2fc]
Former-commit-id: e72b6d5da6
|
2012-10-08 13:26:20 -05:00 |
|
Steve Harris
|
d85a490f06
|
Issue #1250 - Modified the comp.xml files adding kml-export
Change-Id: I53bcbf3199013f02db1ea83c5e665912d6232761
Former-commit-id: 961e000592 [formerly d0c760764f] [formerly 961e000592 [formerly d0c760764f] [formerly 9552a60f54 [formerly 252fbc2ff9e34300c2176a6c149c3af9a523321c]]]
Former-commit-id: 9552a60f54
Former-commit-id: 324cc2ab58 [formerly a94cb4c7bd]
Former-commit-id: 67c18fd17d
|
2012-10-05 10:06:16 -05:00 |
|
Steven Harris
|
2f855322f6
|
12.11.1-1 baseline
Former-commit-id: 0e86bfd1d3 [formerly 618aa3f316] [formerly 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: f5e63d5f93 [formerly 8843ffd022]
Former-commit-id: a544be6d83
|
2012-09-27 15:57:45 -05:00 |
|
Steve Harris
|
94cb625e91
|
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: 686b1756c9 [formerly 8354ca4e68] [formerly 686b1756c9 [formerly 8354ca4e68] [formerly 3827a78a7b [formerly 4ebdc29db766db49df46d568a320c1743d0bb7c0]]]
Former-commit-id: 3827a78a7b
Former-commit-id: 8edfe17e7d [formerly f5f59b6aa5]
Former-commit-id: a20533b551
|
2012-09-25 10:31:57 -05:00 |
|
Steve Harris
|
20732fcbd5
|
12.10.1-6 baseline
Former-commit-id: 81d91a8289 [formerly cebe6534ae] [formerly 81d91a8289 [formerly cebe6534ae] [formerly ba648f8e72 [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]]]
Former-commit-id: ba648f8e72
Former-commit-id: 0e77eb2fe2 [formerly 5d5a61bd75]
Former-commit-id: e39023bb85
|
2012-09-25 10:14:23 -05:00 |
|
Steve Harris
|
30b0700044
|
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: 04de1d5857 [formerly 29e7427dc3] [formerly 04de1d5857 [formerly 29e7427dc3] [formerly 04d9735c8f [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]]
Former-commit-id: 04d9735c8f
Former-commit-id: e23b030dfd [formerly 53673f63e6]
Former-commit-id: f80fb62837
|
2012-09-13 13:26:13 -05:00 |
|
Steve Harris
|
e57e7237a9
|
12.10.1-4 baseline
Former-commit-id: e38e81ab8c [formerly fd19ca5624] [formerly e38e81ab8c [formerly fd19ca5624] [formerly 49c3861597 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]
Former-commit-id: 49c3861597
Former-commit-id: 684feb34e5 [formerly 2ba58a3576]
Former-commit-id: 26b7d083ec
|
2012-09-13 12:08:11 -05:00 |
|
Steve Harris
|
5030894212
|
12.10.1-3 baseline
Former-commit-id: de1639aea2 [formerly 21f430062b] [formerly de1639aea2 [formerly 21f430062b] [formerly 969e7e6dfd [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: f376a4b4db [formerly 438d139fdd]
Former-commit-id: faadb51529
|
2012-09-11 16:00:38 -05:00 |
|
Greg Armendariz
|
2f1d6b3515
|
Merge "Issue #1090 - pattern corrections" into development
Former-commit-id: 3cc51587c6 [formerly 8201f5346f] [formerly 3cc51587c6 [formerly 8201f5346f] [formerly 58b74d05e5 [formerly 9dc5230757d9a09f718fdf1f802e698ac6dd21d2]]]
Former-commit-id: 58b74d05e5
Former-commit-id: e1851f370a [formerly 338f0ebd91]
Former-commit-id: 84b24812c2
|
2012-09-06 13:50:36 -05:00 |
|
Steve Harris
|
ef706c6dd5
|
Issue #1141 - Adding JavaAPIforKml license file
Former-commit-id: 262473a662 [formerly 7d7f20b388] [formerly 262473a662 [formerly 7d7f20b388] [formerly 259bb4dfed [formerly d84394c2f8f62406fee0e039ba0aa283bbbd857e]]]
Former-commit-id: 259bb4dfed
Former-commit-id: 727899cc20 [formerly b9317a53c7]
Former-commit-id: ab4d9d7b75
|
2012-09-06 11:09:24 -05:00 |
|
James Korman
|
f07942db71
|
Issue #1090 - pattern corrections
Former-commit-id: 78c7ce88ac [formerly be350dd763] [formerly 78c7ce88ac [formerly be350dd763] [formerly eb17151f74 [formerly 7849341873013b71b6fe5f01ae3fe274bfc7e8a7]]]
Former-commit-id: eb17151f74
Former-commit-id: 85191cde31 [formerly f36d089fd5]
Former-commit-id: 4b3126493d
|
2012-09-06 09:20:03 -05:00 |
|
Bryan Kowal
|
cc0821e0b0
|
Issue #1130 - merging Wes2Bridge into Common Baseline Delivery II (cherry pick)
Former-commit-id: 35aff16e89 [formerly 137b27d3ff] [formerly 35aff16e89 [formerly 137b27d3ff] [formerly 3e1556a981 [formerly 9a0cd58382909965a6c44cf05fec28eb69835a26]]]
Former-commit-id: 3e1556a981
Former-commit-id: 7ec6eb66ab [formerly a34225c4c9]
Former-commit-id: 6494e3e627
|
2012-09-05 14:44:36 -05:00 |
|
Steve Harris
|
f8e7459dfb
|
Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: 0e046d847a [formerly bba4eb12d0] [formerly 0e046d847a [formerly bba4eb12d0] [formerly af106f1d29 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]]
Former-commit-id: af106f1d29
Former-commit-id: f224e3e8ad [formerly 53e29f59e4]
Former-commit-id: e9582cb789
|
2012-09-04 12:11:03 -05:00 |
|
Steve Harris
|
a924a8347a
|
12.10.1-1 baseline
Former-commit-id: 0abf64b77c [formerly 195158c004] [formerly 0abf64b77c [formerly 195158c004] [formerly d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: e720b8ed31 [formerly 7bd9c63dc7]
Former-commit-id: d65f35ffe9
|
2012-09-04 12:07:27 -05:00 |
|
Steve Harris
|
c1e601dc30
|
12.9.1-12 baseline
Former-commit-id: 4bf4f0043a [formerly 948766c387] [formerly 4bf4f0043a [formerly 948766c387] [formerly 150bc967a5 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]]
Former-commit-id: 150bc967a5
Former-commit-id: 782941ccc1 [formerly 9311c1737e]
Former-commit-id: 38aa573545
|
2012-09-04 11:47:38 -05:00 |
|
Steve Harris
|
b63855f152
|
Merge branch 'ss_builds' (12.9.1-11) into development
Conflicts:
rpms/build/i386/build.sh
Former-commit-id: f52c8b374d [formerly 3a9d4961e2] [formerly f52c8b374d [formerly 3a9d4961e2] [formerly 34cbde4124 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]]]
Former-commit-id: 34cbde4124
Former-commit-id: ffe253196a [formerly 3230e0b246]
Former-commit-id: 5b4ee818b7
|
2012-08-30 14:40:34 -05:00 |
|
Steve Harris
|
ede38c4b3f
|
12.9.1-10 baseline
Former-commit-id: bdb45cdfae [formerly 3adc50a783] [formerly bdb45cdfae [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: f43a5af47f [formerly dc08c5a71a]
Former-commit-id: 5bb474d33c
|
2012-08-30 14:28:27 -05:00 |
|
Steve Harris
|
85533bdd24
|
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: 084ac9fbd4 [formerly d38f8b80f0] [formerly 084ac9fbd4 [formerly d38f8b80f0] [formerly 44a7cb75e7 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]]]
Former-commit-id: 44a7cb75e7
Former-commit-id: b335416e06 [formerly 77369f78a6]
Former-commit-id: 445d1a6a0d
|
2012-08-21 16:17:58 -05:00 |
|
Steve Harris
|
2d928d328e
|
12.9.1-5 baseline
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 7fb0b17bd5 [formerly 72824561cb]
Former-commit-id: 9b5c2094ed
|
2012-08-21 15:27:03 -05:00 |
|
Bryan Kowal
|
29e1bc9993
|
Remove the usage of the old method to build the edex ost rpm.
Former-commit-id: d5c16eb8ce [formerly 44328f1702] [formerly d5c16eb8ce [formerly 44328f1702] [formerly 01e7976a52 [formerly 6fb431fe7f0204e8acc1e8263800c41aa5974bd9]]]
Former-commit-id: 01e7976a52
Former-commit-id: f81ba4737c [formerly 69a16eb369]
Former-commit-id: 1078d7b553
|
2012-08-16 14:27:11 -05:00 |
|
root
|
0eb9520e15
|
Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: 0987fc6b3d [formerly cb46f57879] [formerly 0987fc6b3d [formerly cb46f57879] [formerly 5a453ee984 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]
Former-commit-id: 5a453ee984
Former-commit-id: 537dbadf64 [formerly 8a66b2f209]
Former-commit-id: 1792158ef8
|
2012-08-15 22:15:20 +00:00 |
|
Steve Harris
|
7e1d1f6e08
|
12.9.1-4 baseline
Former-commit-id: 36c108e960 [formerly dcda3a2290] [formerly 36c108e960 [formerly dcda3a2290] [formerly 33b95fb96d [formerly df38541c9df38c634626ae214f288b606004a768]]]
Former-commit-id: 33b95fb96d
Former-commit-id: d7d60cc623 [formerly 9990bf909b]
Former-commit-id: de9b64b501
|
2012-08-15 15:19:10 -05:00 |
|
Steve Harris
|
03bb51ed0e
|
12.9.1-3 baseline
Former-commit-id: c11f7d396e [formerly 36d80b1f60] [formerly c11f7d396e [formerly 36d80b1f60] [formerly 84bbf2573e [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]]
Former-commit-id: 84bbf2573e
Former-commit-id: a535b51eba [formerly edbbacfa8a]
Former-commit-id: 8c5c5ad6eb
|
2012-08-15 14:26:10 -05:00 |
|
Steve Harris
|
16d7d955fc
|
12.9.1-1 baseline
Former-commit-id: 8309193ce9 [formerly 31ae7ea218] [formerly 8309193ce9 [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: aed7a644df [formerly 0c5d9e2416]
Former-commit-id: 63bcadf121
|
2012-08-15 13:59:00 -05:00 |
|
Steve Harris
|
9fd142b98e
|
Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds
Conflicts:
rpms/awips2.64/Installer.h5py/component.spec
Former-commit-id: 9e2d161f8d [formerly f0b7d5e4c5] [formerly 9e2d161f8d [formerly f0b7d5e4c5] [formerly 85f82b18b3 [formerly f6fc0581c3100ef186b90668cb1f1ae4283eaa7b]]]
Former-commit-id: 85f82b18b3
Former-commit-id: 52e0da2293 [formerly b2432e096f]
Former-commit-id: dcc56b8a23
|
2012-08-06 09:38:26 -05:00 |
|
Steve Harris
|
78d66ba6df
|
12.8.1-10 baseline
Former-commit-id: 6244359a80 [formerly b5e8fee24d] [formerly 6244359a80 [formerly b5e8fee24d] [formerly ca25d508ec [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]]
Former-commit-id: ca25d508ec
Former-commit-id: 78d34d65d2 [formerly d5563fc340]
Former-commit-id: 46daa48f1c
|
2012-08-06 09:34:26 -05:00 |
|
Steve Harris
|
b62ac9c78e
|
Merge branch 'development' into development_on_ss_builds
Former-commit-id: 54c505dd8e [formerly 24799cd93d] [formerly 54c505dd8e [formerly 24799cd93d] [formerly a1071e3204 [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]]]
Former-commit-id: a1071e3204
Former-commit-id: dbe07ca70c [formerly 8f4ddad22c]
Former-commit-id: d507458b9b
|
2012-08-06 08:23:04 -05:00 |
|
Bryan Kowal
|
4500559264
|
Issue #997 - the scripted CAVE pde build will now only default to /opt/uframe-eclipse if the user has not specified an alternate eclipse location.
Change-Id: Ib9b5bbd3f89b0a241c7eb1865895e232ac8d85f7
Former-commit-id: 40e69fad53 [formerly e371bd14dd] [formerly 40e69fad53 [formerly e371bd14dd] [formerly 08651d2c21 [formerly 1adbccde6ba44233e9d0cd7e3b9d5220cef64d06]]]
Former-commit-id: 08651d2c21
Former-commit-id: 185daa58d9 [formerly a70bbf3e4d]
Former-commit-id: ed6b7edbe1
|
2012-08-02 16:13:58 -05:00 |
|
Steve Harris
|
078b4fff3c
|
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: fb47934159 [formerly 6d77b94217] [formerly fb47934159 [formerly 6d77b94217] [formerly 51e38ca887 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]]
Former-commit-id: 51e38ca887
Former-commit-id: d2291ba23f [formerly 3476fe755b]
Former-commit-id: e892eb4628
|
2012-08-01 12:43:12 -05:00 |
|
Bryan Kowal
|
2c7a012129
|
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: 6126e4316a [formerly 485334331a] [formerly 6126e4316a [formerly 485334331a] [formerly d07281ac51 [formerly 4dc6be0e1bf32b126a0685109131e1b4b3f5acd1]]]
Former-commit-id: d07281ac51
Former-commit-id: 5b7330ca01 [formerly 024a23e7a3]
Former-commit-id: 692e1d539a
|
2012-08-01 11:50:24 -05:00 |
|
Steve Harris
|
d3be09bd74
|
12.8.1-5 baseline
Former-commit-id: 2653ddc2e3 [formerly fd2abfb6f1] [formerly 2653ddc2e3 [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]
Former-commit-id: cd49ef3eda
Former-commit-id: dab00b12e6 [formerly e0c3722fd1]
Former-commit-id: e86949a8d3
|
2012-08-01 10:45:37 -05:00 |
|
Bryan Kowal
|
67f3b45f91
|
Issue #969 - the top-level directory structure of i386-pc-linux-gnu.tar has slightly changed?
Change-Id: I29cae68e2d87ea8ff078d6ac56211da548e7074f
Former-commit-id: 69bea08034 [formerly c74e48e4a4] [formerly 69bea08034 [formerly c74e48e4a4] [formerly aa5b16537f [formerly 1b7f01a2e8afdf900dae4b124c7b17b91ac68f3d]]]
Former-commit-id: aa5b16537f
Former-commit-id: d27bdae074 [formerly 9fe0b6a424]
Former-commit-id: 0957da3896
|
2012-07-29 09:40:01 -05:00 |
|
Bryan Kowal
|
93967d22c2
|
Issue #969 - removed the individual build of edex-ost; added a feature for edex-ost; the new build will now recognize edex-ost
Change-Id: I3458f32cd994e9fc663116d4930451cefd1cd2f6
Former-commit-id: 67035fa0b8 [formerly 327ffa9439] [formerly 67035fa0b8 [formerly 327ffa9439] [formerly cd40d9accf [formerly dca54e56436ace397c6163b03ac4edb480336404]]]
Former-commit-id: cd40d9accf
Former-commit-id: 6ac43a3c0c [formerly 107831f23d]
Former-commit-id: e0c0b5928f
|
2012-07-28 08:52:36 -05:00 |
|