Steve Harris
|
6f4e8734c8
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: b0a61f5695 [formerly 65d5f13864] [formerly b0a61f5695 [formerly 65d5f13864] [formerly b98eb9ffa4 [formerly 361e9942cf804578fb3e873229c1cd6fd6689fdf]]]
Former-commit-id: b98eb9ffa4
Former-commit-id: 1195e95c8b [formerly 6539b80ded]
Former-commit-id: 2e47683d4a
|
2013-12-02 16:17:38 -06:00 |
|
Steve Harris
|
bfa9d638cc
|
14.1.1-11 baseline
Former-commit-id: 337b138200 [formerly 70a6f1936e] [formerly 337b138200 [formerly 70a6f1936e] [formerly 71ae71c850 [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]]
Former-commit-id: 71ae71c850
Former-commit-id: 8bd818de09 [formerly 5526a8999d]
Former-commit-id: f88a635a58
|
2013-12-02 17:10:10 -05:00 |
|
Steve Harris
|
c4e9fe1c94
|
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: dc4f3b7594 [formerly 1015e180f1] [formerly dc4f3b7594 [formerly 1015e180f1] [formerly 2f0d53c9b2 [formerly 5388a8206a9f447f2ff9030a9e6cfad76efc4cee]]]
Former-commit-id: 2f0d53c9b2
Former-commit-id: 156395b85b [formerly d97edb20d1]
Former-commit-id: 7127a1e665
|
2013-11-15 13:05:40 -06:00 |
|
Steve Harris
|
ed58bc7f71
|
14.1.1-9 baseline
Former-commit-id: a32eadf384 [formerly f8f995b697] [formerly a32eadf384 [formerly f8f995b697] [formerly 5a0a40e67c [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]]
Former-commit-id: 5a0a40e67c
Former-commit-id: eab5bb1147 [formerly 8c136f202d]
Former-commit-id: ea382798b5
|
2013-11-15 12:47:49 -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 |
|
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 |
|
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
|
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 |
|