Ben Steffensmeier
8650074737
Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.
...
Former-commit-id: ba5ff870337c7ac66d633077d84de867e5df967c
2014-03-07 18:15:32 -06:00
Steve Harris
f60aba35d6
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 7d94859f45aaa3d732cbb25fc55348996cfe481c
2014-03-07 15:43:40 -06:00
Steve Harris
40b543f9a8
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 81f446dbc2ae8f8c54cba5b29ed57f113d318160
2014-03-07 15:16:18 -06:00
Brian.Dyke
1fe5504d4c
Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1
...
Former-commit-id: 8b6d5b889e652cbf82c66ae831c9c116626c1494
2014-03-07 11:50:06 -05:00
Steve Harris
ffcc34f8d4
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: 889200c9eb3fbb835f8fef067476799f30a7a7e0
2014-03-06 08:39:43 -06:00
Steve Harris
4b01c57c0a
Merge branch 'master_14.2.1' into ncep_14.2.1
...
Former-commit-id: 505bcf7b47aac1344bb46bac690ce83591b8e554
2014-03-05 13:00:23 -06:00
Max Schenkelberg
cbf8b9249c
Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values.
...
Amend: Added comments and cleaned up preference store
Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d
Former-commit-id: cc34e3dbebe13ec4f63b7529f5053391135837ef
2014-03-04 09:23:36 -06:00
Brian Clements
7a7d476899
Issue #2667 fixed bin lightning menus
...
the column name for the source of the lightning data was changed
Former-commit-id: 62e8a279840672f1ee2bb9f3ecf982c80a04d83c
2014-03-03 13:17:05 -06:00
Richard Peter
1c150e6e8b
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: a47eaa9af45db41391fe46e36ec0793f70d06ad6
2014-02-27 15:18:26 -06:00
Richard Peter
862069dfd3
Issue #2509 : Fix Merge of 13.5.2-4 ncep resources
...
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3
Former-commit-id: 08990cfd910707cbf1731a8f271a52ff922a6345
2014-02-27 13:46:47 -06:00
Brian.Dyke
10b723647b
OB_14.1.1-19 baseline
...
Former-commit-id: db2a591456383d8f980d33757e8c161bdcc01d3a
2014-02-21 06:50:59 -05:00
Ron Anderson
419e9d0b8d
Issue #2819 Removed more unnecessary .clone() calls
...
Change-Id: I6924801040b238354527edfd57b4a3999f844617
Former-commit-id: ce896b573fcef99e30e3bda5f53b0941cd1b2e36
2014-02-19 11:55:11 -06:00
Greg Armendariz
2e79658417
Issue #2754 - Fix import
...
Former-commit-id: 1c9160bd5fe0e8c08ead5a67d9da426834a7669c
2014-02-03 14:45:47 -06:00
Stephen Gilbert
3f6c7ef92c
VLab Issue #2916 - NSHARP Errors Swapping into main pane
...
Fixed some widget management errors in the Show Text dialog's close
method. Ensure Text Dislog's close method is called when swapping
Nsharp display.
Change-Id: I6e645aa552980b49e552a2830f9f148d95f27f3b
Former-commit-id: 0ff12f2c322d9cbed696f9ee4f2049d9efed7863
2014-02-03 14:55:25 -05:00
Steve Harris
7b59bd41eb
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
ncep/gov.noaa.nws.ncep.viz.ui.perspectives/plugin.xml
Former-commit-id: debbd62a40cf8d27b1990d1b06f273d09dd9a981
2014-02-03 10:29:16 -06:00
Steve Harris
eb9d4319dc
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 9133aeccd450b0e241953c588192c2ee33fcbe8e
2014-02-03 10:26:11 -06:00
Brian.Dyke
40ce5ccc2a
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
...
Former-commit-id: 0409f7045a797c8c051a353d69de1991b8c8b681
2014-01-31 08:28:09 -05:00
Stephen Gilbert
0e96169b6f
VLab Issue #2867 - Remove dependency on Mcidas dataplugin
...
Removed the dependency for mcidas dataplugin. The ncep feature
dependencies don't allow for that causing an error in the build scripts.
Change-Id: I9cccc6d93158465f54cb0d9db0e57b16604e1d09
Former-commit-id: 0fa8b0ae9f21df9a1d773edd7e997151c6db9c8f
2014-01-29 09:58:10 -05:00
Stephen Gilbert
f21b0f5d82
VLab Issue #2867 - Add dependency for Mcidas dataplugin
...
Don't like it, but added a dependency for mcidas dataplugin to the
gov.noaa.nws.ncep.vix.common plugin.
Change-Id: Ie8aff1c3ae1733191cb74b7dc0c4593bb37ca28b
Former-commit-id: 61c5dce6e5ee16d776bcac2740ddf4e860fbb40f
2014-01-28 14:52:46 -05:00
Stephen Gilbert
1af8bfa176
Merge "VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1" into ncep_14.2.1
...
Former-commit-id: b928cda17148473922bcd3ad11e33cc93c1e37c3
2014-01-27 14:23:02 -05:00
Stephen Gilbert
bf7fcc1952
Merge "VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1" into ncep_14.2.1
...
Former-commit-id: 2989403fe879801729b1233a54cd5ea314bb2dae
2014-01-27 14:22:17 -05:00
Stephen Gilbert
b64adbed81
Merge "VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1" into ncep_14.2.1
...
Former-commit-id: 57ce64e6119d2bf540da80c1161b88b04474d53c
2014-01-27 14:20:47 -05:00
Stephen Gilbert
369d2592fe
VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1
...
Many changes in NCEP Viz plugins for 14.2.1 enhancements and big fixes
for the National Centers Perspective and PGEN
Change-Id: I4fa707cf0844800a4c77961e110338daafbb0354
Former-commit-id: e3a35c9c3eb2184818b21ba1b23aac988a0148ee
2014-01-24 10:46:37 -05:00
Stephen Gilbert
10a718853d
VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1
...
Updates to configuration files used by the National Centers Perspective
Change-Id: Ie2c8c4f8d0eb57031fb25acbe450b6e3ac56c109
Former-commit-id: 12d9868db2939c53ed49b1cf3092f7d638189696
2014-01-24 10:33:14 -05:00
Stephen Gilbert
2bd1588ad4
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: f64ce96da2871e55b40b6fe4ba0e77eaed266103
2014-01-24 10:14:17 -05:00
Stephen Gilbert
bae1844e81
Merge "VLab Issue #2841 - SWPC delivery for 14.2.1" into ncep_14.2.1
...
Former-commit-id: 015664232a6214feb624262196e45aadc8ee4636
2014-01-23 17:12:28 -05:00
Stephen Gilbert
f0f1a832c7
VLab Issue #2841 - SWPC delivery for 14.2.1
...
Contains functionality for image calculations such
as differencing and ratios.
Also includes config files for displaying SWPC gridded terrestrial data.
Amending commit to address code-review concerns with some java classes.
Change-Id: I3e6e8dbd5015ef825386c1203c333091c6a24f25
Former-commit-id: 5823fba56ae3036682814548004afd076174bb06
2014-01-23 11:58:55 -05:00
Nate Jensen
738c70e8ea
Merge "Issue #2312 Add ability to export gif and image export dialog. Change-Id: I10aaeba20a4acc7888cd566107ffff3e6a4fad05" into development
...
Former-commit-id: 8c8215778f5e37dfa4ec2df000db90f1193107ac
2014-01-22 09:36:33 -06:00
Ben Steffensmeier
4ad4b4a859
Issue #2312 Add ability to export gif and image export dialog.
...
Change-Id: I10aaeba20a4acc7888cd566107ffff3e6a4fad05
Former-commit-id: e2159c422ca93aa76c6ba7a30a09234e8f9da4ce
2014-01-21 18:09:13 -06:00
Steve Harris
69dc3d835b
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: 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90
2014-01-21 12:36:54 -06:00
Richard Peter
57f6096833
Issue #2724 : Fix Airep/Pirep Autoboxing NPE
...
Change-Id: Ieb2823dc220daf4d77a071ba8baaf3831957bd38
Former-commit-id: cbdaaf4d6e28d7001df205ffb7d8d2d56bacd35f
2014-01-21 11:26:30 -06:00
Nate Jensen
5a860252ad
Issue #2359 fix ncep pirep decoding null pointer
...
Change-Id: Id255abcda2d8c661ce8d7d0b022addc69f7635ea
Former-commit-id: 5f554ec21fcedc7f8ef5b3b00fc951527bb424bb
2014-01-20 13:11:36 -06:00
Steve Harris
9371eeeee0
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: cf9f10b2e5a4038dce0003a1c0a4f227335d5db4
2014-01-20 10:17:44 -06:00
Nate Jensen
fa79f2aa14
Issue #2359 fix annoying ncep null pointer
...
Change-Id: I5d606f42bfe4060f8874d2cfaf01a48b548ce25e
Former-commit-id: 0cb0975786aa578e93fe06227c666feb759e0433
2014-01-17 10:24:10 -06:00
Ron Anderson
62c445d872
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: 9f121ec921a2f8635c48f005ddb71787ad6bf166
2014-01-13 17:45:20 -06:00
Nate Jensen
e509a2883f
Issue #2359 prevent obnoxious ncep decoder null pointer exceptions
...
Change-Id: I731614a8a6c9ec38bb6c1b29c4d9f6ca5a7c03d7
Former-commit-id: 514d0cfecd3eb8c81a6d2120406225856d964c9e
2014-01-07 12:38:49 -06:00
Max Schenkelberg
cc2080449c
Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
...
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index
Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5
Former-commit-id: b65366dcdfa48e431b5c8bf10a72879b111cfd8d
2014-01-06 17:03:45 -06:00
Ben Steffensmeier
d79f804d4e
Issue #2537 Split modelsounding into common/edex plugins.
...
Change-Id: I34aa58bc13736109bd71f0b0085df6548c4623a8
Former-commit-id: e80e4aa972c394d699feba553d8d13e4f9dd3a03
2014-01-06 16:02:59 -06:00
Steve Harris
d8e5799328
14.1.1-15 baseline
...
Former-commit-id: cb8eca2a0dfc0e2348301e8d9932db824ecaf34c
2014-01-06 14:08:08 -05:00
Steve Harris
9ef1c841b9
14.1.1-14 baseline
...
Former-commit-id: 46bdb43889bdc681fec2aba45004a1583caaa6ae
2014-01-06 14:02:30 -05:00
Max Schenkelberg
987d4b3a30
Issue #2620 Fixed viz base feature dependency issues.
...
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec
Former-commit-id: 520e22dd848cf6472232d60789e1f6938db7c776
2013-12-09 15:14:01 -06:00
Richard Peter
f8f3ebc6e9
Issue #2551 : Update NCEP objects to extend PersistablePluginDataObject.
...
Amend: Remove IDecoderGettable.
Change-Id: Ic01ebe373da1946a992e10150c1da34119e10d6b
Former-commit-id: 0778a7f0123dd150894458fef6958fcdd9da39b6
2013-12-03 17:24:01 -06:00
Steve Harris
71ae71c850
14.1.1-11 baseline
...
Former-commit-id: c32b2b2037c84cc074e7dc5a5a13b93223640d7d
2013-12-02 17:10:10 -05:00
Brian Clements
0f40ae2b99
Issue #2393 removed pypies interpolation
...
updated datastore interface
updated pypies python code
updated python generated from java classes
moved in-java interpolation code from sat dao to utility classes
changed ncep mcidas dao to use in-java interpolation
changed VIIRS dao to use common interpolation code
Former-commit-id: 6f9ad823de5d0b30ae7c8206b4a4fdf1e3a2b22b
2013-11-20 08:40:12 -06:00
Steve Harris
9248695a1f
14.1.1-10 baseline
...
Former-commit-id: 6970b56e5970df5cd40ddfc41470324d652f0afd
2013-11-19 16:40:25 -05:00
Nate Jensen
78b01f61c4
Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
...
startup
Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700
Former-commit-id: 264b7c80cbd0559c175aef0a99d8f8407b6af7d0
2013-11-14 17:41:24 -06:00
Bryan Kowal
0544b66f4e
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638
2013-11-13 13:16:55 -06:00
Richard Peter
460a7b8b5d
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: 333073fc97c9d454d0e41f8fbe01be3a19b18184
2013-11-12 11:11:36 -06:00
Nate Jensen
7a73c65430
Issue #2361 remove using SerializationUtil for processing XML colormaps
...
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7
Former-commit-id: df601fc0d4c9085c03eec4e12f17878c757ddddf
2013-11-12 10:37:54 -06:00
Bryan Kowal
411e0fa7c4
Issue #2297 - fix 14.2.1 merge
...
Former-commit-id: e5b298f51871ab2ed8be9e70cd1de5a4f8ce7f2b
2013-11-11 13:04:21 -06:00
