Steve Harris
|
655c9931e4
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
rpms/awips2.core/Installer.python/nativeLib/x86_64/gridslice.so (took the master_14.1.1 version)
Former-commit-id: ce7808a309 [formerly cc79281795 [formerly bf9379caa6a1f156997e21a271f27b86d7689ef0]]
Former-commit-id: cc79281795
Former-commit-id: a5f141a2cc
|
2013-12-04 16:48:47 -06:00 |
|
Steve Harris
|
f53eb87892
|
14.1.1-12 baseline
Former-commit-id: a3ec45a99f [formerly b24d9c80b0 [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]
Former-commit-id: b24d9c80b0
Former-commit-id: 371d1ca63c
|
2013-12-04 16:47:59 -05:00 |
|
Steve Harris
|
d33e61a80e
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: b98eb9ffa4 [formerly 65d5f13864 [formerly 361e9942cf804578fb3e873229c1cd6fd6689fdf]]
Former-commit-id: 65d5f13864
Former-commit-id: b0a61f5695
|
2013-12-02 16:17:38 -06:00 |
|
Steve Harris
|
401ee156b8
|
14.1.1-11 baseline
Former-commit-id: 71ae71c850 [formerly 70a6f1936e [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]
Former-commit-id: 70a6f1936e
Former-commit-id: 337b138200
|
2013-12-02 17:10:10 -05:00 |
|
Bryan Kowal
|
1557e44d70
|
Increment python release for gridslice update.
Former-commit-id: c48a946923 [formerly 5f634773fe [formerly 5c5a81739c64ff1ab7f8812be8ac9390e8d85588]]
Former-commit-id: 5f634773fe
Former-commit-id: f413677106
|
2013-11-20 17:40:18 -06:00 |
|
Ron Anderson
|
a83d214f40
|
Issue #2488 Change to use DejaVu fonts
Change-Id: I82f4b93f340bca0e6dfa4f9c14a9890644c9f224
Former-commit-id: 633137d8c0 [formerly d72119409e [formerly 396cd96c02521a33c65fa9e447275307c2d6168c]]
Former-commit-id: d72119409e
Former-commit-id: 7a3c7d530e
|
2013-11-20 13:43:25 -06:00 |
|
Brian Clements
|
dc7ad4d465
|
Issue #2495 changed gridslice to use correct dimension datatype
Former-commit-id: 5e7f2f0bdf [formerly aa24bc6fce [formerly ad33e0ef6530c5528cfa5a349c34a1d11c8c453b]]
Former-commit-id: aa24bc6fce
Former-commit-id: 4c3453a657
|
2013-11-19 17:53:39 -06:00 |
|
Steve Harris
|
70c79bb7e6
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: c0bb3a1102 [formerly 65ebfc1a18 [formerly c333fe23736110bcb273aafd90ee6551ff7e921d]]
Former-commit-id: 65ebfc1a18
Former-commit-id: d1b2cdd566
|
2013-11-19 15:45:06 -06:00 |
|
Steve Harris
|
69cef95302
|
14.1.1-10 baseline
Former-commit-id: 9248695a1f [formerly ca0f65bd9a [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]
Former-commit-id: ca0f65bd9a
Former-commit-id: 8251107646
|
2013-11-19 16:40:25 -05:00 |
|
Steve Harris
|
117cac310b
|
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: 2f0d53c9b2 [formerly 1015e180f1 [formerly 5388a8206a9f447f2ff9030a9e6cfad76efc4cee]]
Former-commit-id: 1015e180f1
Former-commit-id: dc4f3b7594
|
2013-11-15 13:05:40 -06:00 |
|
Steve Harris
|
ba884f2a27
|
14.1.1-9 baseline
Former-commit-id: 5a0a40e67c [formerly f8f995b697 [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]
Former-commit-id: f8f995b697
Former-commit-id: a32eadf384
|
2013-11-15 12:47:49 -05:00 |
|
Greg Armendariz
|
a0b16bafee
|
Merge "Issue #2547 - fix RHEL6 nativeLib build in 14.1.1" into omaha_14.1.1
Former-commit-id: 3f6281fdbe [formerly 83ac36721b [formerly bb6b56a08a09a01a7e6c5a256c16ac246214818a]]
Former-commit-id: 83ac36721b
Former-commit-id: 06e3f849f0
|
2013-11-13 15:30:55 -06:00 |
|
Steve Harris
|
3e8014e9f8
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 2e7a594d51 [formerly 0a37219d2a [formerly ebde6dc849a1ca9753f959423109186c836b4525]]
Former-commit-id: 0a37219d2a
Former-commit-id: eb470599f3
|
2013-11-13 11:34:17 -06:00 |
|
Steve Harris
|
8606fed724
|
14.1.1-8 baseline
Former-commit-id: c7d36eb6ad [formerly aa6c977e7b [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]
Former-commit-id: aa6c977e7b
Former-commit-id: 90bc008a50
|
2013-11-13 12:32:17 -05:00 |
|
Bryan Kowal
|
8afbe25d22
|
Issue #2547 - fix RHEL6 nativeLib build in 14.1.1
Former-commit-id: e3639da703 [formerly a51231058a [formerly 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f]]
Former-commit-id: a51231058a
Former-commit-id: b2272ad695
|
2013-11-12 19:57:25 -06:00 |
|
Steve Harris
|
d92a449ab3
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 3236374cc0 [formerly 51ff88796c [formerly 2a95ac857fe960ed2147545731acc3c093bb73b5]]
Former-commit-id: 51ff88796c
Former-commit-id: b4a37cc39d
|
2013-11-07 11:37:25 -06:00 |
|
Steve Harris
|
824866bca8
|
14.1.1-7 baseline (addendum 1)
deleted ./ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
Former-commit-id: b835dad501 [formerly 2d36bc2c1f [formerly 07f7c24804028aed71fc29cdf6f163a9e9d15623]]
Former-commit-id: 2d36bc2c1f
Former-commit-id: abbecba957
|
2013-11-07 12:09:23 -05:00 |
|
Steve Harris
|
8972badf50
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: d8afc4c58c [formerly c218866826 [formerly 2d5b1f7563e0f8dbd0dadcfa89cad35ba6fac98b]]
Former-commit-id: c218866826
Former-commit-id: cdb514cb5c
|
2013-11-06 13:22:12 -06:00 |
|
Steve Harris
|
21ff310620
|
14.1.1-7 baseline
Former-commit-id: 4fff87723f [formerly 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]
Former-commit-id: 3328e2dd1d
Former-commit-id: 80614c0e52
|
2013-11-06 14:16:14 -05:00 |
|
Steve Harris
|
f44bae4383
|
14.1.1-6 baseline
Former-commit-id: 6067af4252 [formerly 0cb2978c13 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]
Former-commit-id: 0cb2978c13
Former-commit-id: 946a9be17e
|
2013-11-06 14:08:33 -05:00 |
|
Bryan Kowal
|
2ebed2011f
|
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 665911b033 [formerly 412bcb0f21b7385a170d14b3a88dd67c91a301a2]]
Former-commit-id: 665911b033
Former-commit-id: 4d7a4aefec
|
2013-10-31 15:23:08 -05:00 |
|
Steve Harris
|
31eefc21cd
|
14.1.1-5 baseline
Former-commit-id: f4c53b02fa [formerly 877776a04c [formerly b643d85f65fe0393024cf43473fd567d8b7b2b65]]
Former-commit-id: 877776a04c
Former-commit-id: 933e7395ac
|
2013-10-28 12:14:27 -04:00 |
|
Steve Harris
|
cb3b53f205
|
14.1.1-4 baseline
Former-commit-id: 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]
Former-commit-id: bd95bb6a4e
Former-commit-id: 82dec19b6a
|
2013-10-28 10:55:16 -04:00 |
|
Steve Harris
|
a0ba2e1252
|
14.1.1-3 baseline
Former-commit-id: 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]
Former-commit-id: 94f24e0d8a
Former-commit-id: 851f9df229
|
2013-10-28 10:46:02 -04:00 |
|
Bryan Kowal
|
a564f382da
|
Issue #2396 - updated grib2.so to use a newer version of g2clib
Former-commit-id: 9a472e1bbe [formerly b7b11dc747 [formerly 6730ef07554b6e335427bcf08dded302fcc4a398]]
Former-commit-id: b7b11dc747
Former-commit-id: 2ad7db4f5d
|
2013-10-16 12:54:58 -05:00 |
|
Bryan Kowal
|
80c2ccd547
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
rpms/awips2.qpid/0.18/deploy.builder/build.sh
Former-commit-id: 8f14318bc7 [formerly 5eba3290c8 [formerly d6b9ed6ec29c5285ec454fb1c1e65e64a096edb9]]
Former-commit-id: 5eba3290c8
Former-commit-id: 96c800f3f4
|
2013-10-08 10:35:03 -05:00 |
|
Steve Harris
|
553238dca4
|
13.5.2-8 baseline
Former-commit-id: 18325949fb [formerly 94aa71fcd1 [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]
Former-commit-id: 94aa71fcd1
Former-commit-id: 8ba7d392d6
|
2013-10-04 11:30:03 -04:00 |
|
Bryan Kowal
|
20cf44791d
|
Issue #2432 - fix qpid build
Former-commit-id: 6736231873 [formerly 5db663c2ae [formerly ef1e8ac70bec7c9d242c5aed0cf07acaaf2bb31b]]
Former-commit-id: 5db663c2ae
Former-commit-id: fdf31a8a6e
|
2013-10-03 08:33:15 -05:00 |
|
Steve Harris
|
42cf95b398
|
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: 84ad96f2e0 [formerly fc0cdf4996 [formerly 5b5cb6d6fb5d492d9244e3fa50f84710a07811b3]]
Former-commit-id: fc0cdf4996
Former-commit-id: 59f753ee0d
|
2013-10-01 15:34:01 -05:00 |
|
Steve Harris
|
cbda847929
|
13.5.2-7 baseline
Former-commit-id: a212c30bd7 [formerly 0f8fc513bf [formerly dace09a228fa4bef6bddc1388f12d35adcbd7543]]
Former-commit-id: 0f8fc513bf
Former-commit-id: b5cb693619
|
2013-09-30 13:05:31 -04:00 |
|
Steve Harris
|
3cb4574635
|
13.5.2-6 baseline
Former-commit-id: 3837fbe670 [formerly 3821475d4e [formerly 726299a49759971bf9a79ca7598c4f39ecb6721c]]
Former-commit-id: 3821475d4e
Former-commit-id: 059549438a
|
2013-09-23 10:03:15 -04:00 |
|
Bryan Kowal
|
3794ade854
|
Issue #2334 - only free memory when we actually no longer care about its contents.
Change-Id: I49fc1e514c65065ddb6e834a6aeed41f466341f4
Former-commit-id: 706920aed6 [formerly 5e334a7b0e [formerly ac3d847501e41668f923f2ea40572c3894e8dc79]]
Former-commit-id: 5e334a7b0e
Former-commit-id: 0d9fe24f7b
|
2013-09-19 17:32:08 -05:00 |
|
Bryan Kowal
|
4179f9f927
|
Issue #2382 - fix qpid amqp path
Former-commit-id: b002df8a06 [formerly b9f4e93687 [formerly 263ce6e82d1ecf3164961b599c2d4aac7d61f783]]
Former-commit-id: b9f4e93687
Former-commit-id: b84cb9106f
|
2013-09-17 17:51:43 -05:00 |
|
Steve Harris
|
dc60765dcb
|
13.5.2-5 baseline
Former-commit-id: 67cceefe5d [formerly 0745317d53 [formerly ed50e9426fd099fd9336b7bfc8d0c5c35f8500f4]]
Former-commit-id: 0745317d53
Former-commit-id: 31111f4f52
|
2013-09-16 10:14:25 -04:00 |
|
Bryan Kowal
|
c775cb0879
|
Issue #2356 - update httpd-collaboration configuration for new httpd version and RHEL6
Former-commit-id: 646d61335d [formerly 21d395a914 [formerly 21ac850e9cf61f58a324f17ee687f50cda7c5804]]
Former-commit-id: 21d395a914
Former-commit-id: ac9a5ad4d9
|
2013-09-12 13:08:07 -05:00 |
|
Steve Harris
|
3d0b711ccf
|
13.5.2-4 baseline
Former-commit-id: 58c6821427 [formerly e3c935d48b [formerly da631849bc9eaaa5c83c2393520b6099413107a5]]
Former-commit-id: e3c935d48b
Former-commit-id: 595e7bc0d9
|
2013-09-12 11:13:59 -04:00 |
|
Bryan Kowal
|
7125f37454
|
Issue #2356 - pypies configuration updates and RHEL6 compatibility updates
Former-commit-id: ca9597b66a [formerly 826d5e1c78 [formerly 2f1617632a5d24748e915066a7209839bca3f68a]]
Former-commit-id: 826d5e1c78
Former-commit-id: 938e49d7f1
|
2013-09-11 17:34:19 -05:00 |
|
Bryan Kowal
|
5e9e23ffa6
|
Issue #2343 - resolve AWIPS II httpd depenency issue
Former-commit-id: 9a370ca614 [formerly 18756316ce [formerly b5081a38c6d90f47a625fde975f717ff4f63215f]]
Former-commit-id: 18756316ce
Former-commit-id: b6d787103b
|
2013-09-10 17:04:35 -05:00 |
|
Bryan Kowal
|
b2871f542b
|
Issue #2163 - disable Java 7 build
Former-commit-id: 101fd09211 [formerly f8c0886d52 [formerly eb2bba4ac4a43eff894a23f714c8b71fba20419c]]
Former-commit-id: f8c0886d52
Former-commit-id: e062b24680
|
2013-09-09 09:46:09 -05:00 |
|
Bryan Kowal
|
a58482866f
|
Issue #2163 - convert the few remaining python rpms for 14.1.1; remove 13.6 feature modifications
Former-commit-id: 79e88c19aa [formerly 1adf764747 [formerly 4503735d3a05071878683f4a523d0dbd37e47ea3]]
Former-commit-id: 1adf764747
Former-commit-id: 6578b9a7de
|
2013-09-06 12:30:01 -05:00 |
|
Bryan Kowal
|
277d72298e
|
Issue #2163 - fix Eclipse CDT metadata after merge
Former-commit-id: b88a13d3b5 [formerly 351824fb85 [formerly 7502d12a78c68f56e33a41bae7b3346d195ad79f]]
Former-commit-id: 351824fb85
Former-commit-id: ea4cbc4c9a
|
2013-09-04 14:49:47 -05:00 |
|
Bryan Kowal
|
2374999571
|
Issue #2163 - build dynamicserialize and ufpy with the redhat 6 build
Former-commit-id: 03cadc5aa9 [formerly a02d910023 [formerly 422e9b611535e9c20338041e0e1af62d38aab047]]
Former-commit-id: a02d910023
Former-commit-id: 41ab242c2d
|
2013-09-04 13:48:08 -05:00 |
|
Steve Harris
|
7008da4acd
|
13.5.2-3 baseline
Former-commit-id: bae0a20b8e [formerly 9fdd0e51a0 [formerly 51ecc8e9e15940e6cbe2c5da55edc5860ea8b0ca]]
Former-commit-id: 9fdd0e51a0
Former-commit-id: 91fb128c17
|
2013-09-04 14:13:29 -04:00 |
|
Bryan Kowal
|
5b9b97b080
|
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 9db548db3e [formerly 5fb2f3ae5276385fb65c2102ad7619a855947632]]
Former-commit-id: 9db548db3e
Former-commit-id: 5bcf751c50
|
2013-09-04 10:08:21 -05:00 |
|
Steve Harris
|
fec8541795
|
Merge branch 'master_13.5.2' (13.5.2-2) into omaha_14.1.1
Conflicts:
edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
nativeLib/edexBridge/.cproject
nativeLib/edexBridge/edexBridge.cpp
rpms/awips2.core/Installer.ldm/component.spec
rpms/awips2.core/Installer.ldm/patch/ld.so.conf.d/awips2-ldm-i386.conf
rpms/awips2.qpid/0.18/SOURCES/awips.patch
rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec
rpms/awips2.qpid/0.18/deploy.builder/build.sh
rpms/build/common/rpms.sh
Former-commit-id: 7fe19d898c [formerly 18ee1d0092 [formerly b2674e0f626c643f0f81f865ea56351af2531c6a]]
Former-commit-id: 18ee1d0092
Former-commit-id: 433cc78081
|
2013-09-03 16:05:44 -05:00 |
|
Bryan Kowal
|
861a887084
|
Issue #2163 - RHEL6 14.1.1 build updates
Former-commit-id: ab3485a3ed [formerly 9415560b38 [formerly b0e47f4548c235a7cbaefc12e97264ce4c782fce]]
Former-commit-id: 9415560b38
Former-commit-id: 17d652a8dd
|
2013-09-03 13:46:19 -05:00 |
|
Steve Harris
|
8dcd159377
|
13.5.2-2 baseline
Former-commit-id: 9e4bf0cf2e [formerly 4a47fb97c5 [formerly 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9]]
Former-commit-id: 4a47fb97c5
Former-commit-id: 8cde3b2b54
|
2013-08-29 15:01:29 -04:00 |
|
Steve Harris
|
3cd0b2dfc6
|
13.5.2-1 baseline
Former-commit-id: 542b2c3d18 [formerly 73dd0f166c [formerly a362ca91ee5972a1501a2842191fbe2e23feac9c]]
Former-commit-id: 73dd0f166c
Former-commit-id: 894d2425b2
|
2013-08-28 09:43:48 -04:00 |
|
Steve Harris
|
80d8236464
|
13.5.1-18 baseline
Former-commit-id: 0a7acf96c7 [formerly afb34814dd [formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]]
Former-commit-id: afb34814dd
Former-commit-id: d931b80e70
|
2013-08-22 09:12:43 -04:00 |
|
Steve Harris
|
fb9ab08255
|
13.5.1-17 baseline
Former-commit-id: b210c90245 [formerly 9dd7dc5d20 [formerly c5d75a6473b2659b9ac1054a1160c921bd8c1c16]]
Former-commit-id: 9dd7dc5d20
Former-commit-id: 2d882ccb54
|
2013-08-19 16:34:24 -04:00 |
|