Steve Harris
|
0a36987a01
|
Merge branch 'omaha_14.1.1' (14.1.1-9) into development
Conflicts:
cots/org.jep.linux32/libjep.so
cots/org.jep.linux64/libjep.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
(took all the omaha_14.1.1 versions)
Former-commit-id: 42b0235982d6d03e6e14057a1072842fcadc4b85
|
2013-11-15 13:15:25 -06:00 |
|
Steve Harris
|
1015e180f1
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so (took master_14.1.1 version)
Former-commit-id: 5388a8206a9f447f2ff9030a9e6cfad76efc4cee
|
2013-11-15 13:05:40 -06:00 |
|
Steve Harris
|
f8f995b697
|
14.1.1-9 baseline
Former-commit-id: 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5
|
2013-11-15 12:47:49 -05:00 |
|
Richard Peter
|
79bdd34f4f
|
Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
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.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
nativeLib/rary.meteorological/src/solax.f
Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822
Former-commit-id: f7f30006cdaf3c8e99d166463c226b504f458b83
|
2013-11-14 14:40:23 -06:00 |
|
Bryan Kowal
|
86dd200844
|
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 |
|
Steve Harris
|
0a37219d2a
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: ebde6dc849a1ca9753f959423109186c836b4525
|
2013-11-13 11:34:17 -06:00 |
|
Steve Harris
|
aa6c977e7b
|
14.1.1-8 baseline
Former-commit-id: 41e87fe87d5074f138649c5ca8053e658488fbd0
|
2013-11-13 12:32:17 -05:00 |
|
Bryan Kowal
|
7cac007ef1
|
Issue #2297 - update build scripts to complete the full delta build
Former-commit-id: b605c29ae839ca7950bc04426f09eb310587a18f
|
2013-11-12 17:43:10 -06:00 |
|
Richard Peter
|
306bd6fae1
|
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 |
|
Steve Harris
|
fbfe1a5faf
|
Merge branch 'omaha_13.5.3' (13.5.3-6) into development
Former-commit-id: a4c8e9a5fb9d50844da854e453b6146c2a6e75c3
|
2013-11-11 11:45:35 -06:00 |
|
Steve Harris
|
b62ab264f0
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 9d433d2ae29831903e8da23a4b96aee29ee8f5bd
|
2013-11-11 11:40:03 -06:00 |
|
Steve Harris
|
77a45660d5
|
13.5.3-6 baseline
Former-commit-id: 1324512098c1b95d023de932c6fbe872cfeb68f8
|
2013-11-11 12:34:10 -05:00 |
|
Bryan Kowal
|
c3eb4e9af9
|
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: c56c91c7b000b4302ad5e2bac391fd627673cc97
|
2013-11-08 14:51:47 -06:00 |
|
Richard Peter
|
fa7d77ae97
|
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: d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30
|
2013-11-07 14:25:45 -06:00 |
|
Steve Harris
|
b93c4d7cd0
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 433ccf0db5946e18c81e20ec689c9911868fe4c2
|
2013-11-07 11:32:42 -06:00 |
|
Steve Harris
|
06b5e0e0ec
|
13.5.3-5 baseline
Former-commit-id: 427119d391ffb23c0db3fa0dab0a893322a60f8c
|
2013-11-07 12:22:32 -05:00 |
|
Steve Harris
|
c218866826
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 2d5b1f7563e0f8dbd0dadcfa89cad35ba6fac98b
|
2013-11-06 13:22:12 -06:00 |
|
Steve Harris
|
3328e2dd1d
|
14.1.1-7 baseline
Former-commit-id: 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998
|
2013-11-06 14:16:14 -05:00 |
|
Steve Harris
|
0cb2978c13
|
14.1.1-6 baseline
Former-commit-id: 7029e583ef36bf746fddda316ba011e27ed766b4
|
2013-11-06 14:08:33 -05:00 |
|
Bryan Kowal
|
4bad21e6cd
|
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: 4ad10d4cc3b189c65352f0c205fe8664a52bf407
|
2013-11-05 19:03:22 -06:00 |
|
Greg Armendariz
|
62324b5194
|
Issue #2520 - Update rpm query calls
Change-Id: I2fc1ac0fa8b9e199149fd2db3ab25bac9ba90024
Former-commit-id: 95c604d179e14d110e0782a5a911f8b6d5104941
|
2013-11-05 13:30:01 -06:00 |
|
Steve Harris
|
3c862170db
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: dbbf326f4fbfb3e07c97f6a7c380fa7e37544b72
|
2013-11-01 13:23:28 -05:00 |
|
Steve Harris
|
8aeae1c481
|
13.5.3-4 baseline
Former-commit-id: 103d478433e8d0aad0599511c30ef0792f854d13
|
2013-11-01 14:20:00 -04:00 |
|
Bryan Kowal
|
feaacd9356
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
cave/build/static/common/cave/etc/bundles/StationPlot.xml
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
nativeLib/ncep_grib2module/.cproject
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
Former-commit-id: bb2efa59ed211345e071829f47d41eba232baae9
|
2013-10-31 15:34:46 -05:00 |
|
Bryan Kowal
|
665911b033
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
nativeLib/files.native/files.native.ecl
nativeLib/ncep_grib2module/.cproject
nativeLib/rary.cots.g2clib/.project
nativeLib/rary.cots.g2clib/g2_unpack3.c
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1
Former-commit-id: 412bcb0f21b7385a170d14b3a88dd67c91a301a2
|
2013-10-31 15:23:08 -05:00 |
|
Steve Harris
|
2257eb5ddd
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: ec141b61f8f0558ff18d1d67492a066c837f20b7
|
2013-10-31 11:58:04 -05:00 |
|
Steve Harris
|
baa036cd62
|
13.5.3-3 baseline
Former-commit-id: c261e0753eb106a2912314056a1b4903695750c5
|
2013-10-31 12:52:07 -04:00 |
|
Bryan Kowal
|
40e8a94235
|
Re-enable the build of the awips2 rpm.
Former-commit-id: 65ab48743eecfebde890b51a1c74f9a0d68506bf
|
2013-10-30 15:24:01 -05:00 |
|
Greg Armendariz
|
f6d98d6317
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: e1969dc2abafe372c0e9a874f464fc5336efd119
|
2013-10-30 14:52:16 -05:00 |
|
Steve Harris
|
0ab03f2796
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
Former-commit-id: 7466036a36f9fc8eafbac605e44e46cfade0f4a4
|
2013-10-30 12:36:53 -05:00 |
|
Steve Harris
|
055783655b
|
13.5.3-2 baseline
Former-commit-id: 53d73b86bbee5d75bc7cb3a69e12ae78ea22f18f
|
2013-10-30 12:53:25 -04:00 |
|
Bryan Kowal
|
eb4c27003f
|
Issue #2297 - cleanup rpm directory structure; removing files that are no longer needed
Former-commit-id: d6c5bd5476a039058d5251f4457119fb10806b2e
|
2013-10-30 09:23:55 -05:00 |
|
Bryan Kowal
|
7772aca092
|
Issue #2268 - fix CAVE installation error
Former-commit-id: b36df9f89f1c58b1d1a14d05796d656bdeb2d20d
|
2013-10-29 11:44:48 -05:00 |
|
Steve Harris
|
602f138493
|
Merge branch 'master_13.5.3' (13.5.3-1) into omaha_13.5.3
Former-commit-id: 94cbf77eed9914cb3da525dca61ea9e4dfdd16b4
|
2013-10-28 14:39:22 -05:00 |
|
Steve Harris
|
877776a04c
|
14.1.1-5 baseline
Former-commit-id: b643d85f65fe0393024cf43473fd567d8b7b2b65
|
2013-10-28 12:14:27 -04:00 |
|
Steve Harris
|
bd95bb6a4e
|
14.1.1-4 baseline
Former-commit-id: 0cda967cc9da9d2a08a0197db23d48c65f03be81
|
2013-10-28 10:55:16 -04:00 |
|
Steve Harris
|
94f24e0d8a
|
14.1.1-3 baseline
Former-commit-id: cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03
|
2013-10-28 10:46:02 -04:00 |
|
Steve Harris
|
1d8a2026f6
|
13.5.3-1 baseline
Former-commit-id: 04f39d579bad5ebfee1e6ff9e75f49a9ed679f8e
|
2013-10-28 10:30:57 -04:00 |
|
Steve Harris
|
702b66ee52
|
Merge branch 'master_13.5.3' (13.5.2-12) into omaha_13.5.3
Conflicts:
cave/com.raytheon.uf.viz.archive.feature/feature.xml
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java
Former-commit-id: 7233d9cff9df6668f967810d8bd09c99e4ad2807
|
2013-10-25 10:51:42 -05:00 |
|
Steve Harris
|
2100a15013
|
13.5.2-13 baseline
Former-commit-id: f931b3b75bd2581c8942b43d73dff02de4362ecf
|
2013-10-25 10:06:56 -04:00 |
|
Steve Harris
|
a532896473
|
13.5.2-12 baseline
Former-commit-id: 7918a1bb18c212f8a3b84edec932880126d351be
|
2013-10-25 09:59:15 -04:00 |
|
Steve Harris
|
b820a28276
|
13.5.2-11 baseline
Former-commit-id: de1a605c7e59fea76f937d328a68c15209ab5b06
|
2013-10-25 09:45:58 -04:00 |
|
Bryan Kowal
|
b7b11dc747
|
Issue #2396 - updated grib2.so to use a newer version of g2clib
Former-commit-id: 6730ef07554b6e335427bcf08dded302fcc4a398
|
2013-10-16 12:54:58 -05:00 |
|
Bryan Kowal
|
8b3f402dd8
|
Issue #2297 - fix 14.2.1 CAVE build.
Former-commit-id: d71631f5cabae72a1ceb30f36ce574b2559c235d
|
2013-10-15 16:07:23 -05:00 |
|
Bryan Kowal
|
a929dec887
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: b3e74019d1a8550c1c7cbebe219dee3ba7e603b3
|
2013-10-14 17:58:22 -05:00 |
|
Greg Armendariz
|
aa0d3bdab4
|
Merge "Issue #2297 - fix 14.2.1 qpid build" into development
Former-commit-id: 6a11a118261a0cbad93933d99d6a89187c831a02
|
2013-10-14 09:08:05 -05:00 |
|
Bryan Kowal
|
05954f89b8
|
Issue #2402 - re-compile 32-bit grib2.so
Former-commit-id: e70561d259082645390f95df823ad4583aea8bbe
|
2013-10-10 12:49:49 -05:00 |
|
Bryan Kowal
|
9d7ad6908a
|
Issue #2297 - fix 14.2.1 qpid build
Former-commit-id: 7863a68ae1c67188450ab7c3a9cc2c912533300c
|
2013-10-10 11:21:11 -05:00 |
|
Bryan Kowal
|
9c3c123631
|
Issue #2422 - recompile updated grib2.so for RHEL6
Former-commit-id: ae2923791512c7488805c19a773390ef1de5150b
|
2013-10-09 18:38:58 -05:00 |
|
Bryan Kowal
|
37d1dd492b
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
Former-commit-id: 2e6b76af19b308392e90dfee4c950200ec5c2560
|
2013-10-09 17:07:10 -05:00 |
|