xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1788 commits 31 branches 40 tags 3.8 GiB
Commit graph

103 commits

Author SHA1 Message Date
Bryan Kowal
f4e7bead66 Issue #1537 - fixed the edex-environment build 
Former-commit-id: a960b34230 [formerly 7116bb86ef] [formerly fa511e980b [formerly 4b9bd72e929e36d5c949589d5cc4ed6648a069ac]]
Former-commit-id: fa511e980b
Former-commit-id: aefeada9d6
 2013-01-29 09:51:54 -06:00
Bryan Kowal
bc757e5bc1 Issue #1490 - updated edex-environment 
- actually include the modified files in the commit this time

- each edex environment will now receive its own instance of pypies
- a httpd-pypies port and a pypies logging port must now be specified when creating an edex environment
- the location of the pypies configuration file is no longer hard-coded; specified as an environment variable
- made the pypies tcp logging port configurable
- add source headers
- the configuration will now update the ServerRoot

Change-Id: Ie4130caad91f027c9ab547806fb014c0e708596d

Former-commit-id: 792c03d5f4 [formerly b4964c0a19] [formerly 9e33969536 [formerly c96d7532679555f3ccf8a0d7bc07866e63ac177f]]
Former-commit-id: 9e33969536
Former-commit-id: b47d484e70
 2013-01-18 12:44:37 -06:00
Roger Ferrel
86d51634dc Issue #1442 Changes to update display when Simulated Time is changed. Corrections to pqact.conf.template. 
Changes based on code review and added listener to GridManager and unit test.

Change-Id: Ida593a7e3cc7d4fd9bd6f44a4455145114484650

Former-commit-id: 972db12324 [formerly 1cd076671c] [formerly 1e492b81ff [formerly 7f70c2f65453db6bf3097ae8157511c38a36b136]]
Former-commit-id: 1e492b81ff
Former-commit-id: f10521f861
 2013-01-16 16:53:29 -06:00
Richard Peter
79ef100838 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: a966546e31 [formerly 3fb7d96ec1] [formerly 1dbb34523b [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]
Former-commit-id: 1dbb34523b
Former-commit-id: 345dfd2ca9
 2013-01-14 18:07:17 -06:00
Steve Harris
e34695538d 13.2.1-1 baseline 
Former-commit-id: 5dfe4d10f1 [formerly e62172c8c7] [formerly 81849e3cbb [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]
Former-commit-id: 81849e3cbb
Former-commit-id: 8713dfc5ca
 2013-01-14 18:42:21 -05:00
Richard Peter
80bf1d7a28 Issue #1408: Merge 13.1.2-6 into development 
Former-commit-id: d0a6ba23e5 [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]
Former-commit-id: 328be6ac2b
Former-commit-id: 6a5a0d7d09
 2013-01-09 17:55:05 -06:00
Steve Harris
82a1ed77a4 13.1.2-6 baseline 
Former-commit-id: efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 59969775ad
Former-commit-id: dbcae57f57
 2013-01-06 14:55:11 -06:00
Steve Harris
cd4185ef5c 13.1.2-2 baseline 
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
 2013-01-06 14:32:24 -06:00
Roger Ferrel
07fbeb2928 Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly. 
Change-Id: I1f9f5b25d833c14031b9eb257c175de81bc146dc

Former-commit-id: 8c4e70fa9a [formerly 0c5d10e66a] [formerly 43fd607a30 [formerly c1567c66f77077f9411a04f349a17d368424db5f]]
Former-commit-id: 43fd607a30
Former-commit-id: 6d4946290f
 2012-12-18 09:00:46 -06:00
Bryan Kowal
8579adf932 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: 7fb4e993e6 [formerly 660a9b615f] [formerly f39489c44c [formerly 0c579409321e8be6ea9bf2c98c44769fcdf28dcc]]
Former-commit-id: f39489c44c
Former-commit-id: c44c4bd061
 2012-12-16 21:40:26 -06:00
Richard Peter
2100b136a9 Revert "Issue #1262:" 
This reverts commit bad53d1b7f [formerly 9490652103] [formerly 0970259114] [formerly c3da463f39 [formerly a210f08acc] [formerly 0970259114 [formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]]


Former-commit-id: 9d03a53fb5 [formerly 9a7cfa2383] [formerly f37f948456 [formerly a4e51a9f814ff0e004be46460b6d27a848cb2fe9]]
Former-commit-id: f37f948456
Former-commit-id: 48641ca26f
 2012-12-16 20:37:21 -06:00
Bryan Kowal
bad53d1b7f 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: c3da463f39 [formerly a210f08acc] [formerly 0970259114 [formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]
Former-commit-id: 0970259114
Former-commit-id: 9490652103
 2012-12-13 12:40:31 -06:00
Roger Ferrel
662d51cda1 Issue #1411 Change suggest by Dale Morris for pqact.conf.template. 
Change-Id: I9101cb4eab47a82f64212f457d7e0eea11479cc4

Former-commit-id: 6929a73900 [formerly b677a5ba3d] [formerly aefa650cda [formerly b406c990607a06678a58e36118edcddaab073b26]]
Former-commit-id: aefa650cda
Former-commit-id: f64a99d554
 2012-12-11 15:43:54 -06:00
Steve Harris
f02c1ef71d 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: 4d4771ee3a [formerly 43ddfe98c4] [formerly f6988eefff [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]
Former-commit-id: f6988eefff
Former-commit-id: 6287b32e7d
 2012-12-11 08:45:53 -06:00
Steve Harris
69ab975fab 12.12.1-12 baseline 
Former-commit-id: 89def5cf03 [formerly e8e41630e8] [formerly 6d610f8e8a [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 7bb37caa23
 2012-12-06 09:18:28 -06:00
Steve Harris
ff4131c2ee 12.12.1-8 baseline 
Former-commit-id: 2d338b4cec [formerly 19962f41ba] [formerly 5093a7c442 [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]
Former-commit-id: 5093a7c442
Former-commit-id: ee06a94735
 2012-12-06 09:02:51 -06:00
Bryan Kowal
fe9a06b9b9 Issue #1318 - updated ncep database rpm specification file 
Change-Id: Ie4b5ef9b76ce96e21e68f40ffc194cb584a1e832

Former-commit-id: cbef9ad78d [formerly b60dda550c] [formerly fe9dcaa216 [formerly b3f1b857e5a8efcfea0f5b8985eddd5992724d89]]
Former-commit-id: fe9dcaa216
Former-commit-id: 67c3c140e3
 2012-11-15 10:24:38 -06:00
Bryan Kowal
1842deff13 Issue #1318 - updated ncep database rpm specification file 
Change-Id: Iac80537a3fcc7998f93d5a3db9e842d7eea141d9

Former-commit-id: 12667f6180 [formerly 99399e880e] [formerly 24074da383 [formerly f433daa8ffe59da91acba71ac5893d77ad810404]]
Former-commit-id: 24074da383
Former-commit-id: 3d123e08a7
 2012-11-15 09:26:46 -06:00
Dustin Johnson
5d5dbe27e1 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: d27bce13c2 [formerly bff32bbe58] [formerly 0d1d663f41 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]
Former-commit-id: 0d1d663f41
Former-commit-id: e25b7c312b
 2012-11-14 14:41:57 -06:00
Steve Harris
e35a321a8c 12.12.1-4 baseline 
Former-commit-id: b91b7f0fae [formerly 85130eb611] [formerly 57578da521 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]
Former-commit-id: 57578da521
Former-commit-id: 628ca9e5c6
 2012-11-14 14:19:20 -06:00
Steve Harris
21ecd53719 Merge branch 'ss_builds' (12.12.1-3) into development 
Former-commit-id: 8fc896f7d4 [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]
Former-commit-id: 00f3d51546
Former-commit-id: c8cac52915
 2012-11-13 17:28:50 -06:00
Steve Harris
111e7607cf 12.12.1-2 baseline 
Former-commit-id: ed809a02db [formerly a8560580f8] [formerly 6868eb9b23 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]
Former-commit-id: 6868eb9b23
Former-commit-id: df89fe9bed
 2012-11-13 17:14:24 -06:00
Steve Harris
4f243de928 12.12.1-1 baseline 
Former-commit-id: c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e1498006c7
Former-commit-id: 214fcd3b63
 2012-11-07 12:41:20 -06:00
Dustin Johnson
e7a0f96a9a 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: 8e69107b5a [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 31d7d09c10
Former-commit-id: bcf575966b
 2012-11-01 13:36:06 -05:00
Steve Harris
ae9c6d58dd Merge branch 'ss_builds' (12.11.1-7) into development 
Former-commit-id: d42e8373c6 [formerly b7406a55cc] [formerly 38b9c03f5e [formerly 92fcd9f3f15f3bbd49934ea04e4fb6e02c4b8684]]
Former-commit-id: 38b9c03f5e
Former-commit-id: 9d038186d1
 2012-10-23 16:43:09 -05:00
Steve Harris
efba080b9c 12.11.1-7 baseline 
Former-commit-id: 40a5bc1683 [formerly d8ca6b9005] [formerly 79a5638de9 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]]
Former-commit-id: 79a5638de9
Former-commit-id: cfd228f0d7
 2012-10-23 16:40:50 -05:00
Richard Peter
aa26b2a623 Merge "Issue #1265 remove pypies gzip handling" into development 
Former-commit-id: 935ddb3224 [formerly 3723250e50] [formerly cd9306a537 [formerly fd47306a1247721d53b227bf94cc94818b4efc39]]
Former-commit-id: cd9306a537
Former-commit-id: c7894c5cda
 2012-10-17 14:07:28 -05:00
Nate Jensen
9dac98930f Issue #1265 remove pypies gzip handling 
Change-Id: Ia79c1b7b2440849893bacf5cd8290fb5627ed4e5

Former-commit-id: 7874be59e7 [formerly fa3e87549a] [formerly 2dac2f5dde [formerly 6bb4d39b266bedbecff6ecda95bf05e65aa1e58c]]
Former-commit-id: 2dac2f5dde
Former-commit-id: 740146d838
 2012-10-17 11:32:49 -05:00
Steve Harris
a3a79a1a82 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development 
Former-commit-id: 4ffbffe349 [formerly a63b40b17a] [formerly 5e5c98b193 [formerly ecb6a8876078dcff3414ff2a33aa14bf130fa075]]
Former-commit-id: 5e5c98b193
Former-commit-id: be16909d2d
 2012-10-16 21:44:49 -05:00
Steve Harris
d0e91329b4 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 751563e331 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]
Former-commit-id: 751563e331
Former-commit-id: 0c0c1144c6
 2012-10-16 15:48:14 -05:00
Steve Harris
2c82d9cb07 12.11.1-4 baseline 
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: 6958b861f0
Former-commit-id: cbbdb231ce
 2012-10-16 13:27:07 -05:00
Greg Armendariz
1c5bebe6a9 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 b8de817d68 [formerly ab6631a9b47cb5bc6716bc3ba9805bd40665f785]]
Former-commit-id: b8de817d68
Former-commit-id: 2c058c6b8a
 2012-10-16 12:59:00 -05:00
Nate Jensen
93143bbda0 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 8e4a7ec406 [formerly 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1]]
Former-commit-id: 8e4a7ec406
Former-commit-id: 5bdf9d4d38
 2012-10-12 15:16:27 -05:00
James Korman
83bd2e28c4 Issue #1252 - Checked in wrong file. Deleting it. 
Change-Id: Ibe8b9a9708e37f7e697e7133b98d24a0060ebd37

Former-commit-id: c2a4c48f5d [formerly aca18f0a37] [formerly fd783767b2 [formerly a9e332dd585910aa6094d30c3e883451fb0df237]]
Former-commit-id: fd783767b2
Former-commit-id: 31be9c204d
 2012-10-12 14:48:59 -05:00
James Korman
b306b6bd0a Issue #1252 - Updated with changes from Dale Morris 
Former-commit-id: 6d5df727e5 [formerly 2fad414d6d] [formerly 20c61590a4 [formerly f48f637e60f7537da42681dc001332257a046d2b]]
Former-commit-id: 20c61590a4
Former-commit-id: 4ce298e736
 2012-10-12 14:48:59 -05:00
Steven Harris
f5e63d5f93 12.11.1-1 baseline 
Former-commit-id: 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: feec28f274
Former-commit-id: 8843ffd022
 2012-09-27 15:57:45 -05:00
Steve Harris
8edfe17e7d 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 3827a78a7b [formerly 4ebdc29db766db49df46d568a320c1743d0bb7c0]]
Former-commit-id: 3827a78a7b
Former-commit-id: f5f59b6aa5
 2012-09-25 10:31:57 -05:00
Steve Harris
0e77eb2fe2 12.10.1-6 baseline 
Former-commit-id: 81d91a8289 [formerly cebe6534ae] [formerly ba648f8e72 [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]]
Former-commit-id: ba648f8e72
Former-commit-id: 5d5a61bd75
 2012-09-25 10:14:23 -05:00
Steve Harris
e23b030dfd 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 04d9735c8f [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]
Former-commit-id: 04d9735c8f
Former-commit-id: 53673f63e6
 2012-09-13 13:26:13 -05:00
Steve Harris
684feb34e5 12.10.1-4 baseline 
Former-commit-id: e38e81ab8c [formerly fd19ca5624] [formerly 49c3861597 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: 49c3861597
Former-commit-id: 2ba58a3576
 2012-09-13 12:08:11 -05:00
Steve Harris
f376a4b4db 12.10.1-3 baseline 
Former-commit-id: de1639aea2 [formerly 21f430062b] [formerly 969e7e6dfd [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 438d139fdd
 2012-09-11 16:00:38 -05:00
James Korman
85191cde31 Issue #1090 - pattern corrections 
Former-commit-id: 78c7ce88ac [formerly be350dd763] [formerly eb17151f74 [formerly 7849341873013b71b6fe5f01ae3fe274bfc7e8a7]]
Former-commit-id: eb17151f74
Former-commit-id: f36d089fd5
 2012-09-06 09:20:03 -05:00
Bryan Kowal
7ec6eb66ab Issue #1130 - merging Wes2Bridge into Common Baseline Delivery II (cherry pick) 
Former-commit-id: 35aff16e89 [formerly 137b27d3ff] [formerly 3e1556a981 [formerly 9a0cd58382909965a6c44cf05fec28eb69835a26]]
Former-commit-id: 3e1556a981
Former-commit-id: a34225c4c9
 2012-09-05 14:44:36 -05:00
Steve Harris
ffe253196a Merge branch 'ss_builds' (12.9.1-11) into development 
Conflicts:
	rpms/build/i386/build.sh

Former-commit-id: f52c8b374d [formerly 3a9d4961e2] [formerly 34cbde4124 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]]
Former-commit-id: 34cbde4124
Former-commit-id: 3230e0b246
 2012-08-30 14:40:34 -05:00
Steve Harris
f43a5af47f 12.9.1-10 baseline 
Former-commit-id: bdb45cdfae [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]
Former-commit-id: cb9b80f3a0
Former-commit-id: dc08c5a71a
 2012-08-30 14:28:27 -05:00
Steve Harris
b335416e06 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 44a7cb75e7 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]]
Former-commit-id: 44a7cb75e7
Former-commit-id: 77369f78a6
 2012-08-21 16:17:58 -05:00
Steve Harris
7fb0b17bd5 12.9.1-5 baseline 
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
 2012-08-21 15:27:03 -05:00
root
537dbadf64 Merge 12.9.1-4 into development_on_ss_builds 
Former-commit-id: 0987fc6b3d [formerly cb46f57879] [formerly 5a453ee984 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]
Former-commit-id: 5a453ee984
Former-commit-id: 8a66b2f209
 2012-08-15 22:15:20 +00:00
Steve Harris
a535b51eba 12.9.1-3 baseline 
Former-commit-id: c11f7d396e [formerly 36d80b1f60] [formerly 84bbf2573e [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]
Former-commit-id: 84bbf2573e
Former-commit-id: edbbacfa8a
 2012-08-15 14:26:10 -05:00
Steve Harris
aed7a644df 12.9.1-1 baseline 
Former-commit-id: 8309193ce9 [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 79ce6cfd97
Former-commit-id: 0c5d9e2416
 2012-08-15 13:59:00 -05:00