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

207 commits

Author SHA1 Message Date
Steve Harris
1d4d25b49b 13.1.2-6 baseline 
Former-commit-id: 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 8e5f9e0e6c
Former-commit-id: efd3392abe
 2013-01-06 14:55:11 -06:00
Steve Harris
e8f4a2f031 13.1.2-2 baseline 
Former-commit-id: 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: c0c1d56f3a
Former-commit-id: 51208e5515
 2013-01-06 14:32:24 -06:00
Bryan Kowal
a4576aeb23 Issue #1373 - prevent file naming conflicts 
Change-Id: Ibf3996983a0df3eee39fd5bc7d65bf43044c0e02

Former-commit-id: 2c9e5d68fa [formerly 9079c2dd3f [formerly b7c11d1a5d55908a9e60e29b68fa01bf924c1429]]
Former-commit-id: 9079c2dd3f
Former-commit-id: 94fe1c8f59
 2013-01-05 10:40:10 -06:00
Bryan Kowal
09fe6a9c03 Issue #1373 - the edexServiceList script will now be packaged in the edex-base and the datadelivery rpms 
Former-commit-id: e131b5bc72 [formerly 9062ed93d7 [formerly 96fe189b5af5fbf0424504cc0b27d44c1defc0c2]]
Former-commit-id: 9062ed93d7
Former-commit-id: 2d9e54ddf8
 2013-01-04 12:50:37 -06:00
Richard Peter
f941605942 Issue #1373: Update jvm startup to load a service list for services to start. 
Former-commit-id: c1765f776c [formerly 1c560f5013 [formerly b58fed7cb8f04d26397eb9df2273be6588737035]]
Former-commit-id: 1c560f5013
Former-commit-id: af5b616282
 2013-01-03 16:27:32 -06:00
Richard Peter
218b69a387 Merge "Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly." into development 
Former-commit-id: 45f901c1b0 [formerly c3e9f40479 [formerly da48ac436f44dcff85723dfd5befaee9101b6978]]
Former-commit-id: c3e9f40479
Former-commit-id: 314bcffd15
 2012-12-18 13:08:40 -06:00
Roger Ferrel
ecec7603df Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly. 
Change-Id: I1f9f5b25d833c14031b9eb257c175de81bc146dc

Former-commit-id: 43fd607a30 [formerly 0c5d10e66a [formerly c1567c66f77077f9411a04f349a17d368424db5f]]
Former-commit-id: 0c5d10e66a
Former-commit-id: 8c4e70fa9a
 2012-12-18 09:00:46 -06:00
Bryan Kowal
efe8f338b0 Issue #1416: added the python package shapely 
- shapely and dependencies will now be built as part of the
  32-bit build and the 64-bit build from source
- shapely will also be included as part of the AWIPS II
  MSFT Windows environment


Former-commit-id: 5e22c24657 [formerly 8d1e29448a [formerly 82872ebbfb8f2793fb7d95842d33ba8a0cd41ae6]]
Former-commit-id: 8d1e29448a
Former-commit-id: ef0b12813d
 2012-12-17 15:27:43 -06:00
Bryan Kowal
8d50e95643 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: f39489c44c [formerly 660a9b615f [formerly 0c579409321e8be6ea9bf2c98c44769fcdf28dcc]]
Former-commit-id: 660a9b615f
Former-commit-id: 7fb4e993e6
 2012-12-16 21:40:26 -06:00
Richard Peter
80a95c53ba Revert "Issue #1262:" 
This reverts commit 2f31d21ac3 [formerly c3da463f39] [formerly a210f08acc] [formerly 0970259114 [formerly a210f08acc [formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]]


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

Former-commit-id: aefa650cda [formerly b677a5ba3d [formerly b406c990607a06678a58e36118edcddaab073b26]]
Former-commit-id: b677a5ba3d
Former-commit-id: 6929a73900
 2012-12-11 15:43:54 -06:00
Steve Harris
d27c5237c3 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: f6988eefff [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]
Former-commit-id: 43ddfe98c4
Former-commit-id: 4d4771ee3a
 2012-12-11 08:45:53 -06:00
Steve Harris
8b74846a1b 12.12.1-12 baseline 
Former-commit-id: 6d610f8e8a [formerly e8e41630e8 [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]
Former-commit-id: e8e41630e8
Former-commit-id: 89def5cf03
 2012-12-06 09:18:28 -06:00
Steve Harris
8790caf84e 12.12.1-8 baseline 
Former-commit-id: 5093a7c442 [formerly 19962f41ba [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]
Former-commit-id: 19962f41ba
Former-commit-id: 2d338b4cec
 2012-12-06 09:02:51 -06:00
Bryan Kowal
7fd81fb133 Issue #1392 - update tar directory access paths for awips2-edex-native 
Former-commit-id: 6ff82d812e [formerly 73e0f4b278 [formerly 65d91d9235a76c5ee82450d3dd6332f92e29c326]]
Former-commit-id: 73e0f4b278
Former-commit-id: 14555d54d8
 2012-12-05 10:15:37 -06:00
Bryan Kowal
8fe14a9a60 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: f99d351995 [formerly d3b455c955 [formerly ca0b97b8d8db19900107ab38f6a6af8a9ee7b935]]
Former-commit-id: d3b455c955
Former-commit-id: 3a4ca9582d
 2012-11-28 16:30:10 -06:00
Bryan Kowal
b1b627e2c2 Issue #1318 - updated ncep database rpm specification file 
Change-Id: Ie4b5ef9b76ce96e21e68f40ffc194cb584a1e832

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

Former-commit-id: 24074da383 [formerly 99399e880e [formerly f433daa8ffe59da91acba71ac5893d77ad810404]]
Former-commit-id: 99399e880e
Former-commit-id: 12667f6180
 2012-11-15 09:26:46 -06:00
Dustin Johnson
069c8d4788 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: 0d1d663f41 [formerly bff32bbe58 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]
Former-commit-id: bff32bbe58
Former-commit-id: d27bce13c2
 2012-11-14 14:41:57 -06:00
Steve Harris
b968ab5135 12.12.1-4 baseline 
Former-commit-id: 57578da521 [formerly 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]
Former-commit-id: 85130eb611
Former-commit-id: b91b7f0fae
 2012-11-14 14:19:20 -06:00
Steve Harris
1ee8938748 Merge branch 'ss_builds' (12.12.1-3) into development 
Former-commit-id: 00f3d51546 [formerly 448dd1c35f [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]
Former-commit-id: 448dd1c35f
Former-commit-id: 8fc896f7d4
 2012-11-13 17:28:50 -06:00
Steve Harris
7192b19284 12.12.1-2 baseline 
Former-commit-id: 6868eb9b23 [formerly a8560580f8 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]
Former-commit-id: a8560580f8
Former-commit-id: ed809a02db
 2012-11-13 17:14:24 -06:00
Steve Harris
8278cac143 12.12.1-1 baseline 
Former-commit-id: e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e4bd20a515
Former-commit-id: c2839cc86d
 2012-11-07 12:41:20 -06:00
Dustin Johnson
7d0e4a6e75 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: 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 98d7beae50
Former-commit-id: 8e69107b5a
 2012-11-01 13:36:06 -05:00
Steve Harris
eb8a05a414 Merge branch 'ss_builds' into development 
Former-commit-id: afb534db67 [formerly fb46bb053d [formerly 791639aecd4c192b4bb8d8bb692f2c696cde1daa]]
Former-commit-id: fb46bb053d
Former-commit-id: 340ce53e22
 2012-10-29 12:17:12 -05:00
Steve Harris
7f6baf2e24 12.11.1-12 baseline 
Former-commit-id: 9ff9cb8aa3 [formerly 8682e4f6ca [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]
Former-commit-id: 8682e4f6ca
Former-commit-id: 565756567f
 2012-10-29 12:15:56 -05:00
Steve Harris
3a9c6123d2 Merge branch 'ss_builds' (12.11.1-7) into development 
Former-commit-id: 38b9c03f5e [formerly b7406a55cc [formerly 92fcd9f3f15f3bbd49934ea04e4fb6e02c4b8684]]
Former-commit-id: b7406a55cc
Former-commit-id: d42e8373c6
 2012-10-23 16:43:09 -05:00
Steve Harris
59e5b55b96 12.11.1-7 baseline 
Former-commit-id: 79a5638de9 [formerly d8ca6b9005 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]]
Former-commit-id: d8ca6b9005
Former-commit-id: 40a5bc1683
 2012-10-23 16:40:50 -05:00
Steve Harris
95727755c7 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: 1807100932 [formerly a7337d9160 [formerly de600d1a0e309ddbb4838526a9f92af05282cd1a]]
Former-commit-id: a7337d9160
Former-commit-id: 3eff876edd
 2012-10-18 16:01:05 -05:00
Steve Harris
58cd1e90f8 12.11.1-6 baseline 
Former-commit-id: 5c1f3cdc46 [formerly fba4a443a0 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]
Former-commit-id: fba4a443a0
Former-commit-id: 30c786a885
 2012-10-18 15:53:01 -05:00
Steve Harris
bb8fe6e556 12.11.1-5 baseline 
Former-commit-id: a0eaf651ff [formerly 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]
Former-commit-id: 03f3f3c36a
Former-commit-id: 362d6ffaca
 2012-10-18 15:46:42 -05:00
Richard Peter
d0f2925f45 Merge "Issue #1265 remove pypies gzip handling" into development 
Former-commit-id: cd9306a537 [formerly 3723250e50 [formerly fd47306a1247721d53b227bf94cc94818b4efc39]]
Former-commit-id: 3723250e50
Former-commit-id: 935ddb3224
 2012-10-17 14:07:28 -05:00
Nate Jensen
4fc0bee363 Issue #1265 remove pypies gzip handling 
Change-Id: Ia79c1b7b2440849893bacf5cd8290fb5627ed4e5

Former-commit-id: 2dac2f5dde [formerly fa3e87549a [formerly 6bb4d39b266bedbecff6ecda95bf05e65aa1e58c]]
Former-commit-id: fa3e87549a
Former-commit-id: 7874be59e7
 2012-10-17 11:32:49 -05:00
Steve Harris
37ab3d9e65 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development 
Former-commit-id: 5e5c98b193 [formerly a63b40b17a [formerly ecb6a8876078dcff3414ff2a33aa14bf130fa075]]
Former-commit-id: a63b40b17a
Former-commit-id: 4ffbffe349
 2012-10-16 21:44:49 -05:00
Steve Harris
c19835d4be 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: 751563e331 [formerly 4610ecc513 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]
Former-commit-id: 4610ecc513
Former-commit-id: da7a11fe97
 2012-10-16 15:48:14 -05:00
Steve Harris
6e44abdba1 12.11.1-4 baseline 
Former-commit-id: 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: d3497e47eb
Former-commit-id: 98171b5de9
 2012-10-16 13:27:07 -05:00
Greg Armendariz
24cfef1397 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: b8de817d68 [formerly d1772b3705 [formerly ab6631a9b47cb5bc6716bc3ba9805bd40665f785]]
Former-commit-id: d1772b3705
Former-commit-id: 2d18d5791a
 2012-10-16 12:59:00 -05:00
Nate Jensen
134d8a2e3b Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default 
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae

Former-commit-id: 8e4a7ec406 [formerly f2cbf0c5c3 [formerly 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1]]
Former-commit-id: f2cbf0c5c3
Former-commit-id: cbc2da0c06
 2012-10-12 15:16:27 -05:00
James Korman
3ce7b04eab Issue #1252 - Checked in wrong file. Deleting it. 
Change-Id: Ibe8b9a9708e37f7e697e7133b98d24a0060ebd37

Former-commit-id: fd783767b2 [formerly aca18f0a37 [formerly a9e332dd585910aa6094d30c3e883451fb0df237]]
Former-commit-id: aca18f0a37
Former-commit-id: c2a4c48f5d
 2012-10-12 14:48:59 -05:00
James Korman
8d71a3dc92 Issue #1252 - Updated with changes from Dale Morris 
Former-commit-id: 20c61590a4 [formerly 2fad414d6d [formerly f48f637e60f7537da42681dc001332257a046d2b]]
Former-commit-id: 2fad414d6d
Former-commit-id: 6d5df727e5
 2012-10-12 14:48:59 -05:00
Steve Harris
a6c3e16c69 Merge branch 'ss_builds' (12.11.1-2) into development 
Change-Id: I4d3416f5f91d7955dd8eb274cd536563862e2b73

Former-commit-id: 0895f22690 [formerly 8c97afe03b [formerly 1a255600a5e909dc4189e9c88d0735157a400a1d]]
Former-commit-id: 8c97afe03b
Former-commit-id: 7be572b27d
 2012-10-08 13:29:34 -05:00
Steve Harris
04da0dbf50 12.11.1-2 baseline 
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

Former-commit-id: 1e02387ff1 [formerly c12ee14e66 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]
Former-commit-id: c12ee14e66
Former-commit-id: 75901860c2
 2012-10-08 13:26:20 -05:00
Steve Harris
fd922e4d77 Issue #1250 - Modified the comp.xml files adding kml-export 
Change-Id: I53bcbf3199013f02db1ea83c5e665912d6232761

Former-commit-id: 9552a60f54 [formerly d0c760764f [formerly 252fbc2ff9e34300c2176a6c149c3af9a523321c]]
Former-commit-id: d0c760764f
Former-commit-id: 961e000592
 2012-10-05 10:06:16 -05:00
Steven Harris
ffe3641057 12.11.1-1 baseline 
Former-commit-id: feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: 618aa3f316
Former-commit-id: 0e86bfd1d3
 2012-09-27 15:57:45 -05:00
Steve Harris
6cb180ff5b 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: 3827a78a7b [formerly 8354ca4e68 [formerly 4ebdc29db766db49df46d568a320c1743d0bb7c0]]
Former-commit-id: 8354ca4e68
Former-commit-id: 686b1756c9
 2012-09-25 10:31:57 -05:00
Steve Harris
dd922048c0 12.10.1-6 baseline 
Former-commit-id: ba648f8e72 [formerly cebe6534ae [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]]
Former-commit-id: cebe6534ae
Former-commit-id: 81d91a8289
 2012-09-25 10:14:23 -05:00
Steve Harris
bedc9569ca 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: 04d9735c8f [formerly 29e7427dc3 [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]
Former-commit-id: 29e7427dc3
Former-commit-id: 04de1d5857
 2012-09-13 13:26:13 -05:00
Steve Harris
0d8d18d7e2 12.10.1-4 baseline 
Former-commit-id: 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: fd19ca5624
Former-commit-id: e38e81ab8c
 2012-09-13 12:08:11 -05:00
Steve Harris
0403e7d0a9 12.10.1-3 baseline 
Former-commit-id: 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]
Former-commit-id: 21f430062b
Former-commit-id: de1639aea2
 2012-09-11 16:00:38 -05:00