Steve Harris
3ba28aabea
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
...
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: ffcc34f8d4
[formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]
Former-commit-id: 069093884f
2014-03-06 08:39:43 -06:00
Nate Jensen
ad7d5a745b
Issue #2627 shorten wrapper arg for retaining failed data
...
Change-Id: Ib02246cef47d3a19caa61baedbc5538c07d073d7
Former-commit-id: 0dc5dfae82
[formerly 54578116023ebc7a6474a3297d419c2777d31e17]
Former-commit-id: c07f2e829d
2014-03-05 09:04:10 -06:00
Brian.Dyke
271ec85c0c
OB_14.1.1-21 baseline
...
Former-commit-id: 29681c7ca4
[formerly d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b]
Former-commit-id: 1d92e5bab6
2014-03-04 11:47:42 -05:00
Brian Clements
a738448825
Issue #2756 install script for collaboration http server
...
added check for non-edex deployment in plugin-methods.xml
added dataserver feature to use feature-based deployment scripts
moved start/stop scripts to subdirectory
reworked start script to work with external classpath jars
Former-commit-id: 934ce73e4b
[formerly 7d476e67ad00cc8e9c494ed04c7ce0ecc691059a]
Former-commit-id: 3b6121b9fa
2014-03-03 14:07:01 -06:00
Nate Jensen
82817c2cbd
Merge "Issue #2823 deploy install now defaults to x86_64." into development
...
Former-commit-id: d7a8ddbb83
[formerly 75be0d86a588209ff572362f098095beb0b618d2]
Former-commit-id: f7b4c75f13
2014-02-27 16:44:26 -06:00
Brad Gonzales
73ed932660
Issue #2823 deploy install now defaults to x86_64.
...
Change-Id: I06034fd03ab3779d83522134cb8067a64c2dcecc
Former-commit-id: 45160326aa
[formerly 9ef72acfce925dfcfc0df07e7ca5fb558b54d934]
Former-commit-id: 2135663934
2014-02-27 16:34:53 -06:00
Richard Peter
7bd6a07913
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: 1c150e6e8b
[formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]
Former-commit-id: 0e25ae35c1
2014-02-27 15:18:26 -06:00
Brian.Dyke
779553142c
OB_14.1.1-19 baseline
...
Former-commit-id: 10b723647b
[formerly db2a591456383d8f980d33757e8c161bdcc01d3a]
Former-commit-id: cfa4997978
2014-02-21 06:50:59 -05:00
David Gillingham
607ce13c19
Issue #2783 : Rewrite run_report_alarm script into EDEX service.
...
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be
Former-commit-id: de12904c7a
[formerly d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd]
Former-commit-id: 32719432ff
2014-02-18 13:24:37 -06:00
Brad Gonzales
379c0fb46c
Issue #2771 For Data Delivery CAVE now request current id from
...
the registry EDEX. Added DATA_DELIVERY_ID to environment that is used instead
of site id for identification when participating in the federation
and subscription identification.
Amend: Created common data delivery package com.raytheon.uf.edex.datadelivery. Moved DataDeliveryIdUtil there.
Created ClusterIdUtil. DataDeliveryIdUtil uses that utility. It also verifies the id against the awips sites.
Changed centralRegistry.sh to set CLUSTER_ID to NCF.
Handle cases where site id is HAK or HUS.
Check for empty id setting in Cluster ID Util.
Return full id for Data Delivery ID.
Simplify Data Delivery ID and return Cluster ID.
Change-Id: Iee140b5626e1962217cca2deb6d1483ebf265911
Former-commit-id: ba4e308328
[formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]
Former-commit-id: 19460ed0d7
2014-02-18 11:10:44 -06:00
Michael Gamazaychikov
8cd5cce89e
ASM #94
...
Change-Id: I97797a7adbd17532b261987caf2fdcaa1d39c9ed
Former-commit-id: b63053d8b4
[formerly 3c9c34c84ac1cd4962c3e6f877bd33b37aab705a]
Former-commit-id: 42399284ca
2014-02-11 01:32:37 +00:00
Steve Harris
ae2b849157
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
ncep/gov.noaa.nws.ncep.viz.ui.perspectives/plugin.xml
Former-commit-id: 7b59bd41eb
[formerly debbd62a40cf8d27b1990d1b06f273d09dd9a981]
Former-commit-id: 7a156e297a
2014-02-03 10:29:16 -06:00
Steve Harris
131af8538e
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: eb9d4319dc
[formerly 9133aeccd450b0e241953c588192c2ee33fcbe8e]
Former-commit-id: b2032880ac
2014-02-03 10:26:11 -06:00
Steve Harris
14ba3b29f4
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.application/src/com/raytheon/uf/viz/application/VizApplication.java
Former-commit-id: 1aea63a1f6
[formerly d1fb8bcf1780b94bf23ce60dc4a6e0a10b37fe45]
Former-commit-id: 1738185503
2014-01-29 09:41:57 -06:00
Stephen Gilbert
53fa8822e0
Merge "VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1" into ncep_14.2.1
...
Former-commit-id: b64adbed81
[formerly 57ce64e6119d2bf540da80c1161b88b04474d53c]
Former-commit-id: 6785474b17
2014-01-27 14:20:47 -05:00
Brad Gonzales
afbaf72617
Issue #2709 updated devRegistry.sh and added retrieval monolithic for running shareds in devRegistry.
...
Amend: update from peer review.
Change-Id: I1986de99319fdecd21a94579c499266b048d382a
Former-commit-id: 02f9fd20dc
[formerly 4057294c4f777ffb4ea3523bbaea7ed1a084cbd6]
Former-commit-id: e94023097e
2014-01-26 20:31:38 -06:00
Stephen Gilbert
185f06495f
VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1
...
Updates to GRIB decoder tables.
Changes to some decoder plugins to support data ingest through qpid.
Change-Id: Id42e993b1ac76040ad19c970c43036d3f852def0
Former-commit-id: 2bd1588ad4
[formerly f64ce96da2871e55b40b6fe4ba0e77eaed266103]
Former-commit-id: a12b83ddfb
2014-01-24 10:14:17 -05:00
Nate Jensen
e2c9407815
Issue #2359 updated readme with bscalio suggestions
...
Change-Id: I25356e9c6e89473a5442ca1bfdab29b41a996694
Former-commit-id: b08d9d4932
[formerly 2c9c6f8aee77f96911d698bc2031af5e01f03ee0]
Former-commit-id: 90a7339f6d
2014-01-23 09:25:37 -06:00
Nate Jensen
84f2de90fb
Issue #2627 configurable ability to retain failed data, log 'expected'
...
failures as infos without stacktraces
Change-Id: I199c2125bb6c35b703b71ac5e8342d7c0a4dbcb0
Former-commit-id: 50b6eced5d
[formerly 0a1049cb785f782fe7bea8379f7df694dfb45e23]
Former-commit-id: 36ad567a6d
2014-01-22 09:27:46 -06:00
Steve Harris
a465718a0d
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.product.awips/awips.product
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
Former-commit-id: 69dc3d835b
[formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]
Former-commit-id: 24ab7cff49
2014-01-21 12:36:54 -06:00
Ron Anderson
34d1b95a79
Issue #2717 Force use of legacy merge sort
...
Change-Id: Ic37aa4af53f18cc1cbe9bd23420cb692dfa300d7
Former-commit-id: 66bbc99784
[formerly df2af35f3c54b30915cdb6ccebaa30c0e05c7725]
Former-commit-id: de97ec032f
2014-01-20 17:22:26 -06:00
Steve Harris
5fcccbff1b
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
Former-commit-id: 9371eeeee0
[formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]
Former-commit-id: 454d557884
2014-01-20 10:17:44 -06:00
Richard Peter
f30181d730
Issue #2125 : Clean up hibernate warnings
...
Change-Id: Ieb78e7e518a90f09c8db6d72213d5bffa357414e
Former-commit-id: 0c058f461c
[formerly 4a99614b887fe02e1ad9831fc9414ceb6808ba7b]
Former-commit-id: e2d20753e1
2014-01-17 14:12:34 -06:00
Brian Clements
f1c3efdd0e
Issue #2608 quartz components use single scheduler
...
configured quartz components to use a single scheduler
added workaround to camel limitation which requires management name set on context
added quartz properties file copied from the quartz jar (can be used to set thread count)
Former-commit-id: 1a5991dcf5
[formerly 2b16524026b3c8834e5846f8cd800ae4e1a95e07]
Former-commit-id: 3959c9e023
2014-01-14 08:43:21 -06:00
Ron Anderson
0bde38cef3
Merge branch 'master_14.1.1' into solutions
...
Conflicts:
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5
Former-commit-id: 62c445d872
[formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]
Former-commit-id: ba7a25a88f
2014-01-13 17:45:20 -06:00
Brad Gonzales
8eeb3dc412
Issue #2615 Refactored Subscription valid time period calculation from BandwidthDaoUtil to
...
RecurringSubscription. Add environment configuration files to unit tests setup. Changed the
devRegistry debug port to the same port as registry.
Amend: Updates from peer review.
Change-Id: I4f5a25d4667dc949804b86541a9d9428728b779a
Former-commit-id: 343a2495e5
[formerly 33a3dead503276926af71d7355f87242f5250e54]
Former-commit-id: 4537513df7
2014-01-10 16:37:09 -06:00
Brad Gonzales
02910c2a8c
Issue #2645 Prevent the recurring time in SubscriptionNotifyTask from being killed by an exception
...
thrown from run. Fix issue where the InMemoryBandwidthBucketAllocationAssociator was not updating the in memory allocation
when the db value status was updated. Added RegistryBandwidthRecord to the list of classes to init by HibernateBandwidthDbInit.
Updates to hibernate.cfg.xml for Richard.
Change-Id: I0eb7b0a34e48f6b8db8065dee45966c48ef38617
Former-commit-id: 12860c79f9
[formerly e0dbe59a7dc418e3b8ed62396b6ef2047b5990fd]
Former-commit-id: 07a4420596
2014-01-08 13:37:17 -06:00
Steve Harris
f88ff2bde9
14.1.1-15 baseline
...
Former-commit-id: d8e5799328
[formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]
Former-commit-id: 8bbd803ace
2014-01-06 14:08:08 -05:00
Steve Harris
6df7c67f95
14.1.1-14 baseline
...
Former-commit-id: 9ef1c841b9
[formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]
Former-commit-id: f2ad9da4eb
2014-01-06 14:02:30 -05:00
Bryan Kowal
0c3b22c8f2
Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf
...
Amend: wrap file access in try..finally; move StringBuilder outside of a loop
Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da
Former-commit-id: 120ebd045a
[formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]
Former-commit-id: 43008f4698
2013-12-16 16:39:10 -06:00
Brad Gonzales
3d34764022
Issue #2566 Refactored BandwidthManagerCreators to load spring files using Executor.extractSpringFiles.
...
Amend: Refactored Executor static modes specific methods into a EDEXModesUtil class in
the edex.core.modes package. Move EdexMode, DefaultEdexMode, and EdexModesContainer
to the same package.
Change-Id: Ib6af9557ca8d875c5eff162b46bf56e2c041e0fb
Former-commit-id: 72df38075f
[formerly 76a844ed3158bcc80dc0d4b751cad83d39fcbbc4]
Former-commit-id: 410a00c72a
2013-12-05 15:17:14 -06:00
Richard Peter
b3b23647b4
Merge branch 'omaha_14.1.1' (14.1.1-11) into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a
Former-commit-id: a0b6ea8bb2
[formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]
Former-commit-id: 0c4ae068ad
2013-12-05 12:12:27 -06:00
Benjamin Phillippe
f4144fca06
Issue #2534 Added reciprocated registry replication subscriptions
...
Change-Id: I6844d65ccab6c4246f37ce212fa17af09851da27
Former-commit-id: 31b53f4ad9
[formerly 2c52a6ee6f7d491d484c423359b8440975ad6d1e]
Former-commit-id: 212bbeb379
2013-11-27 12:07:59 -06:00
Ben Steffensmeier
cf6ef77d78
Issue #2574 Add DataURIFieldConverter for GridCoverages.
...
Former-commit-id: bdb0e111ea
[formerly 452e129cda35ffe0b4b8d9bd262bd80bfa88d701]
Former-commit-id: 08be03d3fa
2013-11-25 12:17:36 -06:00
Brad Gonzales
5576ac6134
Issue #2545 Renamed datadelivery edex impl files to facilitate modes exclusion. Added
...
monilithic impl config file for a registry that runs as an ncf and wfo for devRegistry mode. Added empty site and
shared and local subscription handlers to enable the FindSubscriptionHandler bean to be configured through spring.
Fix for re-routing Insert and Update registry events as data set metadata events which was lost when the registry
was configured to distinguish between insert and update events. Moved subscriptionRoutesToSchedule bean (and other
beans specific to an implementation) to the ncf, wfo, and monolithic edex impl spring files. Removed the wfo and
ncf specific code from HibernateBandwidthInitializer.executeAfterRegistryInit() since the customized subscription
handlers will be injected through spring. Removed the SBN route from wfo mode.
Amend: Comment updates from peer review.
Change-Id: Ic4c0dca8ebf1e86537e46a6231af58bb65c83cf8
Former-commit-id: 95a1914c71
[formerly c245f741b9e78d8e4503698336d9929536e72e0d]
Former-commit-id: 053f20c70b
2013-11-20 11:58:33 -06:00
Steve Harris
8251107646
14.1.1-10 baseline
...
Former-commit-id: 9248695a1f
[formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]
Former-commit-id: ca0f65bd9a
2013-11-19 16:40:25 -05:00
Steve Harris
90bc008a50
14.1.1-8 baseline
...
Former-commit-id: c7d36eb6ad
[formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]
Former-commit-id: aa6c977e7b
2013-11-13 12:32:17 -05:00
Richard Peter
7ba466f5a6
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
rpms/awips2.core/Installer.httpd-pypies/component.spec
rpms/build/i386/build.sh
rpms/build/i386/build.sh-keep-10032013
rpms/build/i386/build.sh-keep-11012013
rpms/build/x86_64/build.sh
rpms/build/x86_64/build.sh.orig
Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461
Former-commit-id: 460a7b8b5d
[formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]
Former-commit-id: 306bd6fae1
2013-11-12 11:11:36 -06:00
Bryan Kowal
3b8ce3fd34
Merge branch 'omaha_14.1.1' into development_on_RHEL6
...
Conflicts:
RadarServer/com.raytheon.rcm.feature/feature.xml
cave/com.raytheon.uf.viz.archive.feature/feature.xml
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ICaseCopy.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
cots/edu.uci.ics.crawler4j/.classpath
cots/edu.uci.ics.crawler4j/META-INF/MANIFEST.MF
cots/edu.uci.ics.crawler4j/build.properties
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/build.edex/esb/conf/spring/cron.properties
edexOsgi/build.edex/esb/conf/spring/edex.xml
edexOsgi/com.raytheon.edex.plugin.airep/src/com/raytheon/edex/plugin/airep/AirepDecoder.java
edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java
edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/AbstractBUFRUAAdapter.java
edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpRecord.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
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/GridToGribConverter.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/CPCoutlookGribPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/GFSProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/Nam80PostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/SixHrPrecipGridProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/ThreeHrPrecipGridProcessor.java
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
edexOsgi/com.raytheon.edex.plugin.obs/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDecoder.java
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
edexOsgi/com.raytheon.edex.plugin.pirep/src/com/raytheon/edex/plugin/pirep/PirepDecoder.java
edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/POESSoundingDecoder.java
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
edexOsgi/com.raytheon.edex.plugin.shef/unit-test/test/edex/transform/shef/TestMetarToShefTransformer.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.acarssounding/src/com/raytheon/uf/common/dataplugin/acarssounding/ACARSSoundingRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/ncwf/BUFRncwf.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/src/com/raytheon/uf/common/dataplugin/bufrquikscat/QUIKScatObs.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/SigWxData.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/CWARecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/src/com/raytheon/uf/common/dataplugin/goessounding/GOESSounding.java
edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ldadhydro/src/com/raytheon/uf/common/dataplugin/ldadhydro/HydroLdadRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/LocalStormReport.java
edexOsgi/com.raytheon.uf.common.dataplugin.npp.crimss/src/com/raytheon/uf/common/dataplugin/npp/crimss/CrimssRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/src/com/raytheon/uf/common/dataplugin/npp/nucaps/NucapsRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.pirep/src/com/raytheon/uf/common/dataplugin/pirep/PirepRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.profiler/src/com/raytheon/uf/common/dataplugin/profiler/ProfilerObs.java
edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/TropicalCycloneGuidance.java
edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java
edexOsgi/com.raytheon.uf.common.dataplugin.vaa/src/com/raytheon/uf/common/dataplugin/vaa/VAARecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/header/WMOHeaderFinder.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/ResponseProcessingUtilities.java
edexOsgi/com.raytheon.uf.edex.plugin.acars/src/com/raytheon/uf/edex/plugin/acars/decoder/ACARSDataAdapter.java
edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/decoder/SSMIDataAdapter.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/MESOWestDecoder.java
edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/common/MESOWestRecord.java
edexOsgi/com.raytheon.uf.edex.python.decoder/src/com/raytheon/uf/edex/python/decoder/PythonDecoder.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/GenericPointDataRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepPointDataTransform.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/src/gov/noaa/nws/ncep/common/dataplugin/ncccfp/NcccfpRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/GeoMagDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/NcAirepDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/src/gov/noaa/nws/ncep/edex/plugin/ncccfp/decoder/NcccfpDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/NcgribDecoder.py
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgridAssembler.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/src/gov/noaa/nws/ncep/edex/plugin/ncpirep/NcPirepDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/src/gov/noaa/nws/ncep/edex/plugin/stormtrack/decoder/StormTrackDecoder.java
ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/ObservedSoundingQuery.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/src/gov/noaa/nws/ost/edex/plugin/regionalsat/decoder/RegionalSatDecoder.java
rpms/awips2.ade/Installer.eclipse/component.spec.3.6.1
Former-commit-id: f1cd2f2e5a
[formerly c56c91c7b000b4302ad5e2bac391fd627673cc97]
Former-commit-id: c3eb4e9af9
2013-11-08 14:51:47 -06:00
Brian Clements
6f0630aa55
Issue #2515 upgraded camel from 2.11.0 to 2.11.2
...
removed log showBody workaround
Former-commit-id: ea6b162369
[formerly afee27c0b6b574b7d664f47ca0f9369f2b920426]
Former-commit-id: 4f374688c8
2013-11-07 16:56:25 -06:00
Richard Peter
25df870b67
Merge branch 'omaha_13.5.3' (13.5.3-5) into development
...
Conflicts:
RadarServer/com.raytheon.rcm.feature/feature.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9
Former-commit-id: 93c776022a
[formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]
Former-commit-id: fa7d77ae97
2013-11-07 14:25:45 -06:00
Greg Armendariz
805783d8da
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 6456b3a17b
[formerly d12afc98a3fda9c186e87368c53ddc100d4bf2c1]
Former-commit-id: da16b623e1
2013-11-07 12:25:24 -06:00
Benjamin Phillippe
8d47d1bbd4
Issue #2530 Fixed ingest JVM crash on startup
...
Change-Id: Ia3256e509d3ecea06e7c1736330987a8db5bafa3
Former-commit-id: 3561293fdd
[formerly 0cf0136f3cb25328d3a65d15a12cd0a4f4867fcb]
Former-commit-id: 7d605c471e
2013-11-07 10:38:53 -06:00
Steve Harris
2a8e926976
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 1b3d4c8f67
[formerly b0aa5782ea932919ad3e67d460c4809a664b1e08]
Former-commit-id: 108a4d908d
2013-11-06 18:31:05 -06:00
Richard Peter
3c49575ca0
Merge "Issue #2494 Updated to use thread logger" into development
...
Former-commit-id: 10160e3783
[formerly 8eb668a14e1674b3a67816c26b2baeb7c8f45fba]
Former-commit-id: 22bd1521be
2013-11-06 14:03:34 -06:00
Steve Harris
80614c0e52
14.1.1-7 baseline
...
Former-commit-id: 4fff87723f
[formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]
Former-commit-id: 3328e2dd1d
2013-11-06 14:16:14 -05:00
Richard Peter
15fd2f7a55
Issue #2499 : Fix build
...
Change-Id: I6f5269e3fe424f1c7c77225f9b8aa70218c1845c
Former-commit-id: c09f68615c
[formerly 037b2730e59d52f13d3cb3b50490a57b9befb2c1]
Former-commit-id: f3d8768b94
2013-11-06 13:09:32 -06:00
Mike Duff
2a97da896d
Issue #2450 - Send notifications to Notification Center when subscriptions expire.
...
peer review comments
Change-Id: I18eb322d73ee25f30cd1d032b403ea156bc63653
Former-commit-id: f3d07a9185
[formerly fc6fe49db0576c70e2068cd8fac125553806e4c0]
Former-commit-id: 00bb57b481
2013-11-06 12:23:09 -06:00
Dave Hladky
8be14ab6b0
Issue #2494 Updated to use thread logger
...
Former-commit-id: 14469d6e22
[formerly 56505490277f53f77ad80e93aa6a31756a950db6]
Former-commit-id: f890152abc
2013-11-06 08:26:25 -06:00
Bryan Kowal
d73aaf9753
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.csh
rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.sh
rpms/awips2.core/Installer.tools/component.spec
rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.csh
rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.sh
Former-commit-id: 3255bf3861
[formerly 4ad10d4cc3b189c65352f0c205fe8664a52bf407]
Former-commit-id: 4bad21e6cd
2013-11-05 19:03:22 -06:00