Bryan Kowal
|
3da0250e22
|
Omaha #3189 - update the PostgreSQL used by hydro / mpe NativeLib to match the baseline AWIPS II version.
amend: remove debug code
Change-Id: I16d16576af71ad02821c8e65c10081bda5d061e3
Former-commit-id: 2ed7be0b50 [formerly 5ca6dfbf90] [formerly c6518e7378] [formerly 76cd1c2ac8 [formerly c6518e7378 [formerly 9ad4422eb9911f8fbf0c5db40103ee8a1d925570]]]
Former-commit-id: 76cd1c2ac8
Former-commit-id: 9cf4ec67daf3fedeef46142cce66d82caad1e57e [formerly b6baecf271]
Former-commit-id: 5f438c4a08
|
2014-05-20 11:02:31 -05:00 |
|
Steve Harris
|
b455a385e9
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: d33e61a80e [formerly b0a61f5695] [formerly 65d5f13864] [formerly b98eb9ffa4 [formerly 65d5f13864 [formerly 361e9942cf804578fb3e873229c1cd6fd6689fdf]]]
Former-commit-id: b98eb9ffa4
Former-commit-id: b210ab8842ebdea3014e30e92d627d7f9a1742d7 [formerly 6539b80ded]
Former-commit-id: 1195e95c8b
|
2013-12-02 16:17:38 -06:00 |
|
Steve Harris
|
41a54a5ca6
|
14.1.1-11 baseline
Former-commit-id: 401ee156b8 [formerly 337b138200] [formerly bcc2fb56db7acfd2f7ecd928f118488dc7beb36e [formerly 70a6f1936e]] [formerly 71ae71c850 [formerly 70a6f1936e [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]]
Former-commit-id: 71ae71c850
Former-commit-id: 2a75dd3165e6ee0eb548ce9cbb694967018bb4bf [formerly 5526a8999d]
Former-commit-id: 8bd818de09
|
2013-12-02 17:10:10 -05:00 |
|
Steve Harris
|
b1d82b9c2c
|
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: 117cac310b [formerly dc4f3b7594] [formerly 1015e180f1] [formerly 2f0d53c9b2 [formerly 1015e180f1 [formerly 5388a8206a9f447f2ff9030a9e6cfad76efc4cee]]]
Former-commit-id: 2f0d53c9b2
Former-commit-id: 72d35279c7375fe7db3bdc163cd5fbd4a655ec1d [formerly d97edb20d1]
Former-commit-id: 156395b85b
|
2013-11-15 13:05:40 -06:00 |
|
Steve Harris
|
7977f24d77
|
14.1.1-9 baseline
Former-commit-id: ba884f2a27 [formerly a32eadf384] [formerly f8f995b697] [formerly 5a0a40e67c [formerly f8f995b697 [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]]
Former-commit-id: 5a0a40e67c
Former-commit-id: 1abf0e99cad9d8f5d8540c9724d2144a5aab0211 [formerly 8c136f202d]
Former-commit-id: eab5bb1147
|
2013-11-15 12:47:49 -05:00 |
|
Bryan Kowal
|
f37abe3599
|
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: 2ebed2011f [formerly 4d7a4aefec] [formerly 665911b033] [formerly c76c856340 [formerly 665911b033 [formerly 412bcb0f21b7385a170d14b3a88dd67c91a301a2]]]
Former-commit-id: c76c856340
Former-commit-id: a87ff201ab972ea4012700b7f82b08857452a1f6 [formerly 0954490a5a]
Former-commit-id: 7a83214b1c
|
2013-10-31 15:23:08 -05:00 |
|
Steve Harris
|
2039d101ef
|
14.1.1-4 baseline
Former-commit-id: cb3b53f205 [formerly 82dec19b6a] [formerly 20443a5d933e8268c1fb3f455df197a71fca1203 [formerly bd95bb6a4e]] [formerly 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e]
Former-commit-id: b60635cd70
|
2013-10-28 10:55:16 -04:00 |
|
Steve Harris
|
2d30611c6d
|
14.1.1-3 baseline
Former-commit-id: a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]
Former-commit-id: 5739b4f832
Former-commit-id: 164f1968b2ad159ca45dcba9ade0490d55b9ed19 [formerly 4a6a209aea]
Former-commit-id: aa59400b67
|
2013-10-28 10:46:02 -04:00 |
|
Steve Harris
|
4f4af06329
|
13.5.2-6 baseline
Former-commit-id: 3cb4574635 [formerly 059549438a] [formerly 3821475d4e] [formerly 3837fbe670 [formerly 3821475d4e [formerly 726299a49759971bf9a79ca7598c4f39ecb6721c]]]
Former-commit-id: 3837fbe670
Former-commit-id: 3c4113cbd9b34d856c9d3a2aa3b0c92346ba75b4 [formerly 22cb9b98cd]
Former-commit-id: 557a7c87d5
|
2013-09-23 10:03:15 -04:00 |
|
Bryan Kowal
|
47160fb743
|
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: 5b9b97b080 [formerly 5bcf751c50] [formerly 9db548db3e] [formerly 326cae8be4 [formerly 9db548db3e [formerly 5fb2f3ae5276385fb65c2102ad7619a855947632]]]
Former-commit-id: 326cae8be4
Former-commit-id: 5f5e74b7dd3ceb43cb11f3eb9a628232439ee13d [formerly 573aeaa238]
Former-commit-id: 98e4f44a7d
|
2013-09-04 10:08:21 -05:00 |
|
Bryan Kowal
|
5ccd628305
|
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: 31ee9b4bdc [formerly a962be9a15] [formerly 0b4961e9b0] [formerly 8b51e353f1 [formerly 0b4961e9b0 [formerly 0a735f5fe81d5329bc02a421ecc39a0974d48d37]]]
Former-commit-id: 8b51e353f1
Former-commit-id: b7034f9b0272242db414c96f4e37cd005d0e39a8 [formerly 5dffc9321c]
Former-commit-id: 9943f3a57c
|
2013-08-15 15:38:11 -05:00 |
|
Greg Armendariz
|
076a0b08ac
|
13.5.1-13 baseline
Former-commit-id: 429898edc6 [formerly f0b62a22bf] [formerly 29b823fee4] [formerly 5577e686c1 [formerly 29b823fee4 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]]
Former-commit-id: 5577e686c1
Former-commit-id: 12247e45609042e5a8e46278311d4b5b7ec9eb9d [formerly 8bfac41add]
Former-commit-id: 9f2f62427b
|
2013-08-08 17:00:36 -04:00 |
|
Steve Harris
|
0fe8173b7b
|
13.5.1-7 baseline
Former-commit-id: 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 86ce1248c2 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]
Former-commit-id: 86ce1248c2
Former-commit-id: 5aea78fbd5da8a55b6f4dc4542505312f878d73d [formerly f9c9aecba5]
Former-commit-id: cb50a0028d
|
2013-07-18 12:07:22 -04:00 |
|
Steve Harris
|
43b7a9b410
|
13.5.1-1 baseline
Former-commit-id: 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e]
Former-commit-id: 0aab285b8a
|
2013-06-10 15:17:17 -04:00 |
|
Steve Harris
|
6e1e454a9f
|
13.4.1-7 baseline
Former-commit-id: 81bc07bff4 [formerly 8072752c77] [formerly 4c6ff79e71] [formerly 8347bed50e [formerly 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]]
Former-commit-id: 8347bed50e
Former-commit-id: f3152ba9f38327cd1d37f2849c62a4d8c8652434 [formerly b35027f661]
Former-commit-id: ff7a21ac37
|
2013-05-13 12:58:10 -04:00 |
|