Bryan Kowal
|
38464427d3
|
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: c8d7a32e2e [formerly bb2efa59ed211345e071829f47d41eba232baae9]
Former-commit-id: feaacd9356
|
2013-10-31 15:34:46 -05:00 |
|
Bryan Kowal
|
4d7a4aefec
|
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: c76c856340 [formerly 412bcb0f21b7385a170d14b3a88dd67c91a301a2]
Former-commit-id: 665911b033
|
2013-10-31 15:23:08 -05:00 |
|
Steve Harris
|
82dec19b6a
|
14.1.1-4 baseline
Former-commit-id: 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]
Former-commit-id: bd95bb6a4e
|
2013-10-28 10:55:16 -04:00 |
|
Steve Harris
|
851f9df229
|
14.1.1-3 baseline
Former-commit-id: 5739b4f832 [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]
Former-commit-id: 94f24e0d8a
|
2013-10-28 10:46:02 -04:00 |
|
Bryan Kowal
|
2ad7db4f5d
|
Issue #2396 - updated grib2.so to use a newer version of g2clib
Former-commit-id: 9a472e1bbe [formerly 6730ef07554b6e335427bcf08dded302fcc4a398]
Former-commit-id: b7b11dc747
|
2013-10-16 12:54:58 -05:00 |
|
Bryan Kowal
|
efd377f12f
|
Issue #2422 - fix 14.2.1 RHEL6 build
Former-commit-id: 87087a5ea4 [formerly 19b9b3e4f5e3bc3d78c25afe4507c3e9c11eacb6]
Former-commit-id: 61527c0b80
|
2013-10-02 18:41:11 -05:00 |
|
Bryan Kowal
|
5bcf751c50
|
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: 326cae8be4 [formerly 5fb2f3ae5276385fb65c2102ad7619a855947632]
Former-commit-id: 9db548db3e
|
2013-09-04 10:08:21 -05:00 |
|
Steve Harris
|
d931b80e70
|
13.5.1-18 baseline
Former-commit-id: 0a7acf96c7 [formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]
Former-commit-id: afb34814dd
|
2013-08-22 09:12:43 -04:00 |
|
Bryan Kowal
|
2b4faafed7
|
Issue #2163 - python rpm specification and awips2-notification compatibility with RedHat 6
Former-commit-id: be011d3b92 [formerly f2497ff20afefdcf67b0b4bcc17f9ee358d2288d]
Former-commit-id: e3e596eb5d
|
2013-08-15 15:24:11 -05:00 |
|
Steve Harris
|
c56be8a332
|
13.5.1-4 baseline
Former-commit-id: e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]
Former-commit-id: 70e4ff30a6
|
2013-06-28 09:46:25 -04:00 |
|
Steve Harris
|
2e110bd151
|
13.3.1-6 baseline
Former-commit-id: 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]
Former-commit-id: 3a4c7931e1
|
2013-03-12 08:35:45 -05:00 |
|
Steve Harris
|
33bc5fd816
|
13.2.1-2 baseline
Former-commit-id: 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]
Former-commit-id: 83e9157df7
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
a1d931fd44
|
12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: 61f269f54c
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
750b7543dd
|
12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 67a5a68300
|
2012-04-18 15:18:16 -05:00 |
|
root
|
a02aeb236c
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 9f19e3f712
|
2012-01-06 08:55:05 -06:00 |
|