Richard Peter
|
0074b774f0
|
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
|
e3639da703
|
Issue #2547 - fix RHEL6 nativeLib build in 14.1.1
Former-commit-id: 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f
|
2013-11-12 19:57:25 -06:00 |
|
Bryan Kowal
|
c8d7a32e2e
|
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
|
c76c856340
|
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
|
99e3707c5b
|
14.1.1-4 baseline
Former-commit-id: 0cda967cc9da9d2a08a0197db23d48c65f03be81
|
2013-10-28 10:55:16 -04:00 |
|
Steve Harris
|
5739b4f832
|
14.1.1-3 baseline
Former-commit-id: cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03
|
2013-10-28 10:46:02 -04:00 |
|
Bryan Kowal
|
9a472e1bbe
|
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
|
87087a5ea4
|
Issue #2422 - fix 14.2.1 RHEL6 build
Former-commit-id: 19b9b3e4f5e3bc3d78c25afe4507c3e9c11eacb6
|
2013-10-02 18:41:11 -05:00 |
|
Bryan Kowal
|
326cae8be4
|
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: 5fb2f3ae5276385fb65c2102ad7619a855947632
|
2013-09-04 10:08:21 -05:00 |
|
Steve Harris
|
0a7acf96c7
|
13.5.1-18 baseline
Former-commit-id: f407ad6db2f621a5be95939aea88f49d874d1ab6
|
2013-08-22 09:12:43 -04:00 |
|
Bryan Kowal
|
be011d3b92
|
Issue #2163 - python rpm specification and awips2-notification compatibility with RedHat 6
Former-commit-id: f2497ff20afefdcf67b0b4bcc17f9ee358d2288d
|
2013-08-15 15:24:11 -05:00 |
|
Steve Harris
|
e197f23ce3
|
13.5.1-4 baseline
Former-commit-id: d18b403b332dff67d1c85d4317bbceda337d1b41
|
2013-06-28 09:46:25 -04:00 |
|
Steve Harris
|
566b677d09
|
13.3.1-6 baseline
Former-commit-id: fecc19685d09be66f3eeeee392e565a1ce8b7e65
|
2013-03-12 08:35:45 -05:00 |
|
Steve Harris
|
328c6dccad
|
13.2.1-2 baseline
Former-commit-id: bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
f2fac39428
|
12.9.1-5 baseline
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
2a216f333c
|
12.4.1-4 baseline
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
|
2012-04-18 15:18:16 -05:00 |
|
root
|
06a8b51d6d
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
|
2012-01-06 08:55:05 -06:00 |
|