Bryan Kowal
|
f5bb76a01e
|
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: 38464427d3 [formerly feaacd9356] [formerly 38464427d3 [formerly feaacd9356] [formerly c8d7a32e2e [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: f02d4b7a0b [formerly d366e70934]
Former-commit-id: eaaa3d022c
|
2013-10-31 15:34:46 -05:00 |
|
Bryan Kowal
|
731efe0fb6
|
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: 4d7a4aefec [formerly 665911b033] [formerly 4d7a4aefec [formerly 665911b033] [formerly c76c856340 [formerly 412bcb0f21b7385a170d14b3a88dd67c91a301a2]]]
Former-commit-id: c76c856340
Former-commit-id: 7a83214b1c [formerly 0954490a5a]
Former-commit-id: 6e08dc72c0
|
2013-10-31 15:23:08 -05:00 |
|
Steve Harris
|
da4589ec2b
|
14.1.1-4 baseline
Former-commit-id: 82dec19b6a [formerly bd95bb6a4e] [formerly 82dec19b6a [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]
Former-commit-id: 99e3707c5b
Former-commit-id: b60635cd70 [formerly 7590a56e0e]
Former-commit-id: 98ae84da42
|
2013-10-28 10:55:16 -04:00 |
|
Steve Harris
|
472c0a1a5e
|
14.1.1-3 baseline
Former-commit-id: 851f9df229 [formerly 94f24e0d8a] [formerly 851f9df229 [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]
Former-commit-id: 5739b4f832
Former-commit-id: aa59400b67 [formerly 4a6a209aea]
Former-commit-id: 8d67ffede4
|
2013-10-28 10:46:02 -04:00 |
|
Bryan Kowal
|
93dbbc2321
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/CombinationsInterface.py
cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/FFG_TIR_HIRES/FFG_TIR_HIRES.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar
edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.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.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.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/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SmartInitRequestHandler.java
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
edexOsgi/com.raytheon.uf.edex.ogc.common/com.raytheon.uf.edex.ogc.common.ecl
edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/com.raytheon.uf.edex.plugin.grib.ogc.ecl
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.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/python.site-packages/Installer.qpid/component.spec
Former-commit-id: bb5ef114d1 [formerly aa4ea792c1] [formerly bb5ef114d1 [formerly aa4ea792c1] [formerly 542f5f2349 [formerly 606030384b5fe1eb9411d4b35d3282b15b1398b4]]]
Former-commit-id: 542f5f2349
Former-commit-id: de61382dc7 [formerly 5d5ccb7599]
Former-commit-id: 86f7af5968
|
2013-10-08 14:44:38 -05:00 |
|
Steve Harris
|
160a5819f9
|
Merge branch 'master_14.1.1' (13.5.2-7) into omaha_14.1.1
Conflicts:
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
rpms/python.site-packages/Installer.qpid/component.spec
kept the omaha_14.1.1 versions of the .so files
Former-commit-id: 59f753ee0d [formerly fc0cdf4996] [formerly 59f753ee0d [formerly fc0cdf4996] [formerly 84ad96f2e0 [formerly 5b5cb6d6fb5d492d9244e3fa50f84710a07811b3]]]
Former-commit-id: 84ad96f2e0
Former-commit-id: c2fa80310e [formerly c6a4241c5b]
Former-commit-id: 9aa19b42b5
|
2013-10-01 15:34:01 -05:00 |
|
Bryan Kowal
|
7bd9ea3d30
|
Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
cave/build/alertviz/customTargets.xml
cave/build/p2-build.xml
edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
edexOsgi/meteolib.jni.linux64/libmeteoLib.so
javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
nativeLib/ncep_grib2module/.cproject
nativeLib/rary.meteorological/.cproject
nativeLib/rary.meteorological/src/dcapeFunc.c
rpms/awips2.cave/Installer.cave-etc/component.spec
rpms/awips2.cave/Installer.cave-feature/component.spec
rpms/awips2.core/Installer.aviation/component.spec
rpms/awips2.qpid/0.18/deploy.builder/build.sh
rpms/python.site-packages/Installer.qpid/component.spec
Former-commit-id: bb5acf7c11 [formerly c125b5b053] [formerly bb5acf7c11 [formerly c125b5b053] [formerly 9829477ced [formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]]]
Former-commit-id: 9829477ced
Former-commit-id: 0f825df590 [formerly ef789bf912]
Former-commit-id: 0efd4c7c50
|
2013-09-30 18:00:31 -05:00 |
|
Steve Harris
|
b7b8d4a0b7
|
13.5.2-6 baseline
Former-commit-id: 059549438a [formerly 3821475d4e] [formerly 059549438a [formerly 3821475d4e] [formerly 3837fbe670 [formerly 726299a49759971bf9a79ca7598c4f39ecb6721c]]]
Former-commit-id: 3837fbe670
Former-commit-id: 557a7c87d5 [formerly 22cb9b98cd]
Former-commit-id: f91cf37d43
|
2013-09-23 10:03:15 -04:00 |
|
Steve Harris
|
609926f1f4
|
13.5.2-4 baseline
Former-commit-id: 595e7bc0d9 [formerly e3c935d48b] [formerly 595e7bc0d9 [formerly e3c935d48b] [formerly 58c6821427 [formerly da631849bc9eaaa5c83c2393520b6099413107a5]]]
Former-commit-id: 58c6821427
Former-commit-id: 4c6790f10f [formerly abed443b59]
Former-commit-id: e2398f74e5
|
2013-09-12 11:13:59 -04:00 |
|
Bryan Kowal
|
3daf51dacf
|
Issue #2163 - RHEL6 nativeLib changes required for compiler compatibility
- Amend: restore mpe changes
- Amend: attempt rebase
Change-Id: I7763e2b8b56cc9d2caae022f35e72c82a7f1da90
Conflicts:
nativeLib/edex_com/.cproject
nativeLib/edex_notify/.cproject
Former-commit-id: 5bcf751c50 [formerly 9db548db3e] [formerly 5bcf751c50 [formerly 9db548db3e] [formerly 326cae8be4 [formerly 5fb2f3ae5276385fb65c2102ad7619a855947632]]]
Former-commit-id: 326cae8be4
Former-commit-id: 98e4f44a7d [formerly 573aeaa238]
Former-commit-id: 929e30a520
|
2013-09-04 10:08:21 -05:00 |
|
Bryan Kowal
|
9f506d7ce6
|
Issue #2163 - fixed awips2-openfire and re-compiled nativeLib for RHEL6.
Conflicts:
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
Former-commit-id: a962be9a15 [formerly 0b4961e9b0] [formerly a962be9a15 [formerly 0b4961e9b0] [formerly 8b51e353f1 [formerly 0a735f5fe81d5329bc02a421ecc39a0974d48d37]]]
Former-commit-id: 8b51e353f1
Former-commit-id: 9943f3a57c [formerly 5dffc9321c]
Former-commit-id: 9af6b44727
|
2013-08-15 15:38:11 -05:00 |
|
Steve Harris
|
d0be6956e9
|
13.5.1-15 baseline
Former-commit-id: 535218c676 [formerly 53e96e21db] [formerly 535218c676 [formerly 53e96e21db] [formerly c6dc1817e7 [formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]]
Former-commit-id: c6dc1817e7
Former-commit-id: 4f9288e7c1 [formerly 65beefde58]
Former-commit-id: 9ea3f0c215
|
2013-08-14 10:24:26 -04:00 |
|
Greg Armendariz
|
0c61b62d24
|
13.5.1-13 baseline
Former-commit-id: f0b62a22bf [formerly 29b823fee4] [formerly f0b62a22bf [formerly 29b823fee4] [formerly 5577e686c1 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]]
Former-commit-id: 5577e686c1
Former-commit-id: 9f2f62427b [formerly 8bfac41add]
Former-commit-id: b66fcc40a5
|
2013-08-08 17:00:36 -04:00 |
|
Steve Harris
|
767b7fdb4d
|
13.5.1-8 baseline
Former-commit-id: 392faf86e7 [formerly 3bece5e5d0] [formerly 392faf86e7 [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: a7d4c6274e [formerly 2afb46f814]
Former-commit-id: 1a3197efdf
|
2013-07-26 09:02:34 -04:00 |
|
Steve Harris
|
513c089375
|
13.5.1-7 baseline
Former-commit-id: 630705aa3f [formerly bf58a81b38] [formerly 630705aa3f [formerly bf58a81b38] [formerly 86ce1248c2 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]
Former-commit-id: 86ce1248c2
Former-commit-id: cb50a0028d [formerly f9c9aecba5]
Former-commit-id: eff4fb29dd
|
2013-07-18 12:07:22 -04:00 |
|
Steve Harris
|
c05a6c8b50
|
13.5.1-4 baseline
Former-commit-id: c56be8a332 [formerly 70e4ff30a6] [formerly c56be8a332 [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 640b022e84 [formerly f658320357]
Former-commit-id: c183e08922
|
2013-06-28 09:46:25 -04:00 |
|
Steve Harris
|
afc02d5731
|
13.5.1-2 baseline
Former-commit-id: bc60b22f00 [formerly adb779323d] [formerly bc60b22f00 [formerly adb779323d] [formerly 3386330894 [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]
Former-commit-id: 3386330894
Former-commit-id: ccd66c0724 [formerly 3926dc20f7]
Former-commit-id: 332a74c4de
|
2013-06-17 15:01:22 -04:00 |
|
Steve Harris
|
859965fc9d
|
13.5.1-1 baseline
Former-commit-id: 6384018950 [formerly 998961612c] [formerly 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 0aab285b8a [formerly 30ba1d634e]
Former-commit-id: 146c5e8940
|
2013-06-10 15:17:17 -04:00 |
|
Steve Harris
|
c7c6ea343e
|
13.4.1-7 baseline
Former-commit-id: 8072752c77 [formerly 4c6ff79e71] [formerly 8072752c77 [formerly 4c6ff79e71] [formerly 8347bed50e [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]]
Former-commit-id: 8347bed50e
Former-commit-id: ff7a21ac37 [formerly b35027f661]
Former-commit-id: dffa6d3bdc
|
2013-05-13 12:58:10 -04:00 |
|