Ron Anderson
|
bbb24dfdbd
|
Issue #2488 Change to use DejaVu fonts
Change-Id: I82f4b93f340bca0e6dfa4f9c14a9890644c9f224
Former-commit-id: a83d214f40 [formerly 7a3c7d530e] [formerly d72119409e] [formerly 633137d8c0 [formerly d72119409e [formerly 396cd96c02521a33c65fa9e447275307c2d6168c]]]
Former-commit-id: 633137d8c0
Former-commit-id: ebfd4c9fd692514b821af5e75fe51a87a50ddecc [formerly f6b9e69738]
Former-commit-id: 769df41dea
|
2013-11-20 13:43:25 -06:00 |
|
Brian Clements
|
b7a10192f4
|
Issue #2495 changed gridslice to use correct dimension datatype
Former-commit-id: dc7ad4d465 [formerly 4c3453a657] [formerly aa24bc6fce] [formerly 5e7f2f0bdf [formerly aa24bc6fce [formerly ad33e0ef6530c5528cfa5a349c34a1d11c8c453b]]]
Former-commit-id: 5e7f2f0bdf
Former-commit-id: a6c84a48a463eebfa267a1df2818691820f5dc81 [formerly 05b2a015cb]
Former-commit-id: 90601f6ff8
|
2013-11-19 17:53:39 -06:00 |
|
Steve Harris
|
2ed2e93b03
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 70c79bb7e6 [formerly d1b2cdd566] [formerly 65ebfc1a18] [formerly c0bb3a1102 [formerly 65ebfc1a18 [formerly c333fe23736110bcb273aafd90ee6551ff7e921d]]]
Former-commit-id: c0bb3a1102
Former-commit-id: 44a31523c0eab129c3c048ad551394d20361765b [formerly e8c6af3060]
Former-commit-id: eff32cfbf3
|
2013-11-19 15:45:06 -06:00 |
|
Steve Harris
|
2c49ed51ac
|
14.1.1-10 baseline
Former-commit-id: 69cef95302 [formerly 8251107646] [formerly ca0f65bd9a] [formerly 9248695a1f [formerly ca0f65bd9a [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]]
Former-commit-id: 9248695a1f
Former-commit-id: 3a680dda0eb4accc0f16a467d0582447a9f8a94f [formerly ef6e0b0304]
Former-commit-id: e35ec60f7e
|
2013-11-19 16:40:25 -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 |
|
Greg Armendariz
|
2d92a5719c
|
Merge "Issue #2547 - fix RHEL6 nativeLib build in 14.1.1" into omaha_14.1.1
Former-commit-id: a0b16bafee [formerly 06e3f849f0] [formerly 83ac36721b] [formerly 3f6281fdbe [formerly 83ac36721b [formerly bb6b56a08a09a01a7e6c5a256c16ac246214818a]]]
Former-commit-id: 3f6281fdbe
Former-commit-id: a557332626ac393163cd374e7ee121dc81df86a4 [formerly ce0a05242f]
Former-commit-id: b7c3a7e850
|
2013-11-13 15:30:55 -06:00 |
|
Steve Harris
|
6af0dcf567
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 3e8014e9f8 [formerly eb470599f3] [formerly 0a37219d2a] [formerly 2e7a594d51 [formerly 0a37219d2a [formerly ebde6dc849a1ca9753f959423109186c836b4525]]]
Former-commit-id: 2e7a594d51
Former-commit-id: 30e7b1a9427f9e36f5c8eb8e65eb8f79733ce8fb [formerly bc45f3668b]
Former-commit-id: 80c709b3f4
|
2013-11-13 11:34:17 -06:00 |
|
Steve Harris
|
1902ca9cfb
|
14.1.1-8 baseline
Former-commit-id: 8606fed724 [formerly 90bc008a50] [formerly aa6c977e7b] [formerly c7d36eb6ad [formerly aa6c977e7b [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]]
Former-commit-id: c7d36eb6ad
Former-commit-id: 308b50b78ab6c50e65c5dc077e1c7d14c94b3bd7 [formerly 0123596fd9]
Former-commit-id: b7ca6163e3
|
2013-11-13 12:32:17 -05:00 |
|
Bryan Kowal
|
ad1e4c66b8
|
Issue #2547 - fix RHEL6 nativeLib build in 14.1.1
Former-commit-id: 8afbe25d22 [formerly b2272ad695] [formerly a51231058a] [formerly e3639da703 [formerly a51231058a [formerly 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f]]]
Former-commit-id: e3639da703
Former-commit-id: 9b2674319137dc98ffe2e221d63d5f3dae8f1e22 [formerly 48d5d8c3a1]
Former-commit-id: b2c63727ba
|
2013-11-12 19:57:25 -06:00 |
|
Steve Harris
|
832c44a4e6
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: d92a449ab3 [formerly b4a37cc39d] [formerly e8def3779ef9a61ffc2c0ccfe2be186b24e11e4e [formerly 51ff88796c]] [formerly 3236374cc0 [formerly 51ff88796c [formerly 2a95ac857fe960ed2147545731acc3c093bb73b5]]]
Former-commit-id: 3236374cc0
Former-commit-id: 5d7fccdc69b60104c2941a8a74d13d1bd1961367 [formerly 224d25217b]
Former-commit-id: 9141c578ff
|
2013-11-07 11:37:25 -06:00 |
|
Steve Harris
|
93e9333a2e
|
14.1.1-7 baseline (addendum 1)
deleted ./ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
Former-commit-id: 824866bca8 [formerly abbecba957] [formerly 2d36bc2c1f] [formerly b835dad501 [formerly 2d36bc2c1f [formerly 07f7c24804028aed71fc29cdf6f163a9e9d15623]]]
Former-commit-id: b835dad501
Former-commit-id: 9b114a2ed684d2ac0bd0e804a8a6594626e1cb9e [formerly 155bc487ff]
Former-commit-id: a72bb1669f
|
2013-11-07 12:09:23 -05:00 |
|
Steve Harris
|
4add6dde39
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 8972badf50 [formerly cdb514cb5c] [formerly c218866826] [formerly d8afc4c58c [formerly c218866826 [formerly 2d5b1f7563e0f8dbd0dadcfa89cad35ba6fac98b]]]
Former-commit-id: d8afc4c58c
Former-commit-id: b07c466ba916dfa6be08058979658327eff3043c [formerly 7c71117a50]
Former-commit-id: a48b85a0b2
|
2013-11-06 13:22:12 -06:00 |
|
Steve Harris
|
4d2f53ebc6
|
14.1.1-7 baseline
Former-commit-id: 21ff310620 [formerly 80614c0e52] [formerly 3328e2dd1d] [formerly 4fff87723f [formerly 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]
Former-commit-id: 4fff87723f
Former-commit-id: d44a91d984ae1d600e17c54655b8255108cade35 [formerly 48df058653]
Former-commit-id: b694612fe0
|
2013-11-06 14:16:14 -05:00 |
|
Steve Harris
|
2a5f4c26d6
|
14.1.1-6 baseline
Former-commit-id: f44bae4383 [formerly 946a9be17e] [formerly 0cb2978c13] [formerly 6067af4252 [formerly 0cb2978c13 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]]
Former-commit-id: 6067af4252
Former-commit-id: 70967acd51143f4f43cec1322c400d567f95c3ce [formerly 26da1ce793]
Former-commit-id: e86a0aa489
|
2013-11-06 14:08:33 -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
|
7de3535d64
|
14.1.1-5 baseline
Former-commit-id: 31eefc21cd [formerly 933e7395ac] [formerly 877776a04c] [formerly f4c53b02fa [formerly 877776a04c [formerly b643d85f65fe0393024cf43473fd567d8b7b2b65]]]
Former-commit-id: f4c53b02fa
Former-commit-id: ba0194dff6dd3d0a89190211a15a136f32ca0270 [formerly af2707389c]
Former-commit-id: 3b738baba8
|
2013-10-28 12:14:27 -04: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 |
|
Bryan Kowal
|
d6ea68d9c5
|
Issue #2396 - updated grib2.so to use a newer version of g2clib
Former-commit-id: a564f382da [formerly 2ad7db4f5d] [formerly b7b11dc747] [formerly 9a472e1bbe [formerly b7b11dc747 [formerly 6730ef07554b6e335427bcf08dded302fcc4a398]]]
Former-commit-id: 9a472e1bbe
Former-commit-id: 8d9c6dc200980dd6606b3b3826f070666ae2fefa [formerly f892849313]
Former-commit-id: b1bdf0dbc5
|
2013-10-16 12:54:58 -05:00 |
|
Bryan Kowal
|
ef0e6ede56
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
rpms/awips2.qpid/0.18/deploy.builder/build.sh
Former-commit-id: 80c2ccd547 [formerly 96c800f3f4] [formerly 5eba3290c8] [formerly 8f14318bc7 [formerly 5eba3290c8 [formerly d6b9ed6ec29c5285ec454fb1c1e65e64a096edb9]]]
Former-commit-id: 8f14318bc7
Former-commit-id: d3917f8d40a980b637b27fc44df2b93eff0d5796 [formerly 53af4c7284]
Former-commit-id: 72ed6c5f7a
|
2013-10-08 10:35:03 -05:00 |
|
Steve Harris
|
9e5ad5cd96
|
13.5.2-8 baseline
Former-commit-id: 553238dca4 [formerly 8ba7d392d6] [formerly 94aa71fcd1] [formerly 18325949fb [formerly 94aa71fcd1 [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]
Former-commit-id: 18325949fb
Former-commit-id: 728c3d36e228a9bf13f56508d31b8e5babc82b06 [formerly d89fbf73d9]
Former-commit-id: 21b84f0290
|
2013-10-04 11:30:03 -04:00 |
|
Bryan Kowal
|
51cf9ed479
|
Issue #2432 - fix qpid build
Former-commit-id: 20cf44791d [formerly fdf31a8a6e] [formerly 5db663c2ae] [formerly 6736231873 [formerly 5db663c2ae [formerly ef1e8ac70bec7c9d242c5aed0cf07acaaf2bb31b]]]
Former-commit-id: 6736231873
Former-commit-id: f0d8690b42b34a08e3cc25f03f917bd6fd863575 [formerly f100a9c96a]
Former-commit-id: bd93d164c7
|
2013-10-03 08:33:15 -05:00 |
|
Steve Harris
|
7fbcfe7e31
|
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: 42cf95b398 [formerly 59f753ee0d] [formerly fc0cdf4996] [formerly 84ad96f2e0 [formerly fc0cdf4996 [formerly 5b5cb6d6fb5d492d9244e3fa50f84710a07811b3]]]
Former-commit-id: 84ad96f2e0
Former-commit-id: fdd4df5abe5cb73e831f675a386f04a37e52c5b9 [formerly c6a4241c5b]
Former-commit-id: c2fa80310e
|
2013-10-01 15:34:01 -05:00 |
|
Steve Harris
|
430d088fae
|
13.5.2-7 baseline
Former-commit-id: cbda847929 [formerly b5cb693619] [formerly 0f8fc513bf] [formerly a212c30bd7 [formerly 0f8fc513bf [formerly dace09a228fa4bef6bddc1388f12d35adcbd7543]]]
Former-commit-id: a212c30bd7
Former-commit-id: 8a4b80da2796beb7c54f486f50af54a82a51b808 [formerly 02d6145782]
Former-commit-id: 06ba0dbf6c
|
2013-09-30 13:05:31 -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
|
c71603ddb3
|
Issue #2334 - only free memory when we actually no longer care about its contents.
Change-Id: I49fc1e514c65065ddb6e834a6aeed41f466341f4
Former-commit-id: 3794ade854 [formerly 0d9fe24f7b] [formerly 5e334a7b0e] [formerly 706920aed6 [formerly 5e334a7b0e [formerly ac3d847501e41668f923f2ea40572c3894e8dc79]]]
Former-commit-id: 706920aed6
Former-commit-id: e3edd648a9a4f9aa02d5b7f1f450f6103f4ca525 [formerly 34f85b41c2]
Former-commit-id: 0f702bf515
|
2013-09-19 17:32:08 -05:00 |
|
Bryan Kowal
|
77b339ea66
|
Issue #2382 - fix qpid amqp path
Former-commit-id: 4179f9f927 [formerly b84cb9106f] [formerly b9f4e93687] [formerly b002df8a06 [formerly b9f4e93687 [formerly 263ce6e82d1ecf3164961b599c2d4aac7d61f783]]]
Former-commit-id: b002df8a06
Former-commit-id: f786adcc134d577e9f93acb1482d9559bd497a3f [formerly 8ce22ec91a]
Former-commit-id: eb6cc0320c
|
2013-09-17 17:51:43 -05:00 |
|
Steve Harris
|
4c4dd59711
|
13.5.2-5 baseline
Former-commit-id: dc60765dcb [formerly 31111f4f52] [formerly 0745317d53] [formerly 67cceefe5d [formerly 0745317d53 [formerly ed50e9426fd099fd9336b7bfc8d0c5c35f8500f4]]]
Former-commit-id: 67cceefe5d
Former-commit-id: 738f26259951c00c72cc70df42f55b887349b3ef [formerly 6202bacae1]
Former-commit-id: c8ead44672
|
2013-09-16 10:14:25 -04:00 |
|
Bryan Kowal
|
1ae63f3157
|
Issue #2356 - update httpd-collaboration configuration for new httpd version and RHEL6
Former-commit-id: c775cb0879 [formerly ac9a5ad4d9] [formerly 21d395a914] [formerly 646d61335d [formerly 21d395a914 [formerly 21ac850e9cf61f58a324f17ee687f50cda7c5804]]]
Former-commit-id: 646d61335d
Former-commit-id: 34755fb2aa71834eccf3544a836d15e84ca85428 [formerly 8d936cbfc3]
Former-commit-id: 118ea128c6
|
2013-09-12 13:08:07 -05:00 |
|
Steve Harris
|
a8201afb82
|
13.5.2-4 baseline
Former-commit-id: 3d0b711ccf [formerly 595e7bc0d9] [formerly e3c935d48b] [formerly 58c6821427 [formerly e3c935d48b [formerly da631849bc9eaaa5c83c2393520b6099413107a5]]]
Former-commit-id: 58c6821427
Former-commit-id: 1a01e9adff02825a5599659ed7c17823430819bc [formerly abed443b59]
Former-commit-id: 4c6790f10f
|
2013-09-12 11:13:59 -04:00 |
|
Bryan Kowal
|
3a1d03c001
|
Issue #2356 - pypies configuration updates and RHEL6 compatibility updates
Former-commit-id: 7125f37454 [formerly 938e49d7f1] [formerly 826d5e1c78] [formerly ca9597b66a [formerly 826d5e1c78 [formerly 2f1617632a5d24748e915066a7209839bca3f68a]]]
Former-commit-id: ca9597b66a
Former-commit-id: 84d980d70d0ce9c1e1176eca66b2e53a40563d1e [formerly 1a59a35500]
Former-commit-id: baab46f8d1
|
2013-09-11 17:34:19 -05:00 |
|
Bryan Kowal
|
1d0f7a96d2
|
Issue #2343 - resolve AWIPS II httpd depenency issue
Former-commit-id: 5e9e23ffa6 [formerly b6d787103b] [formerly 18756316ce] [formerly 9a370ca614 [formerly 18756316ce [formerly b5081a38c6d90f47a625fde975f717ff4f63215f]]]
Former-commit-id: 9a370ca614
Former-commit-id: bc7a84e1a11d7e93be480b3c93b8f2e1b8d046c9 [formerly aa88d48c30]
Former-commit-id: 3e27389e5b
|
2013-09-10 17:04:35 -05:00 |
|
Bryan Kowal
|
3a37ab654c
|
Issue #2163 - disable Java 7 build
Former-commit-id: b2871f542b [formerly e062b24680] [formerly a62b8b58d7a781d472cd70528a4cffab3b537897 [formerly f8c0886d52]] [formerly 101fd09211 [formerly f8c0886d52 [formerly eb2bba4ac4a43eff894a23f714c8b71fba20419c]]]
Former-commit-id: 101fd09211
Former-commit-id: e88e489fbfdc65a5fb95edd76f00600dbdd7b328 [formerly 4c1a283575]
Former-commit-id: 4f859e716c
|
2013-09-09 09:46:09 -05:00 |
|
Bryan Kowal
|
7b209d0c22
|
Issue #2163 - convert the few remaining python rpms for 14.1.1; remove 13.6 feature modifications
Former-commit-id: a58482866f [formerly 6578b9a7de] [formerly 1adf764747] [formerly 79e88c19aa [formerly 1adf764747 [formerly 4503735d3a05071878683f4a523d0dbd37e47ea3]]]
Former-commit-id: 79e88c19aa
Former-commit-id: 4410ae3e4d51d61cc16e04ba9bb3b7110221a5a9 [formerly aa8eb47b95]
Former-commit-id: 2a35fb001d
|
2013-09-06 12:30:01 -05:00 |
|
Bryan Kowal
|
f5b3756c16
|
Issue #2163 - fix Eclipse CDT metadata after merge
Former-commit-id: 277d72298e [formerly ea4cbc4c9a] [formerly 351824fb85] [formerly b88a13d3b5 [formerly 351824fb85 [formerly 7502d12a78c68f56e33a41bae7b3346d195ad79f]]]
Former-commit-id: b88a13d3b5
Former-commit-id: 36773401b7a2515d282f22c11fbcd2c522248e81 [formerly 4670dcb9a7]
Former-commit-id: 1918d5e96a
|
2013-09-04 14:49:47 -05:00 |
|
Bryan Kowal
|
2fbf708d37
|
Issue #2163 - build dynamicserialize and ufpy with the redhat 6 build
Former-commit-id: 2374999571 [formerly 41ab242c2d] [formerly a02d910023] [formerly 03cadc5aa9 [formerly a02d910023 [formerly 422e9b611535e9c20338041e0e1af62d38aab047]]]
Former-commit-id: 03cadc5aa9
Former-commit-id: a1835e61d037b5682286f5b833659d21414debeb [formerly 65bb1ec74b]
Former-commit-id: 9c890422fa
|
2013-09-04 13:48:08 -05:00 |
|
Steve Harris
|
c232631639
|
13.5.2-3 baseline
Former-commit-id: 7008da4acd [formerly 91fb128c17] [formerly 9fdd0e51a0] [formerly bae0a20b8e [formerly 9fdd0e51a0 [formerly 51ecc8e9e15940e6cbe2c5da55edc5860ea8b0ca]]]
Former-commit-id: bae0a20b8e
Former-commit-id: 6d2b921e8731c04bdf279dff1768af30f0c643a6 [formerly c666ac7283]
Former-commit-id: 8ac02ce922
|
2013-09-04 14:13:29 -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 |
|
Steve Harris
|
0f6f34ec8c
|
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: fec8541795 [formerly 433cc78081] [formerly 18ee1d0092] [formerly 7fe19d898c [formerly 18ee1d0092 [formerly b2674e0f626c643f0f81f865ea56351af2531c6a]]]
Former-commit-id: 7fe19d898c
Former-commit-id: 5a94406e31101181f9717f529104887e73712284 [formerly 0514103d87]
Former-commit-id: 55bbf0f747
|
2013-09-03 16:05:44 -05:00 |
|
Bryan Kowal
|
ece1f596c6
|
Issue #2163 - RHEL6 14.1.1 build updates
Former-commit-id: 861a887084 [formerly 17d652a8dd] [formerly 9415560b38] [formerly ab3485a3ed [formerly 9415560b38 [formerly b0e47f4548c235a7cbaefc12e97264ce4c782fce]]]
Former-commit-id: ab3485a3ed
Former-commit-id: dbc6b10841e1b6bd48ab2c5bb58813c728e5fbb6 [formerly 17b8ded082]
Former-commit-id: 751f005228
|
2013-09-03 13:46:19 -05:00 |
|
Steve Harris
|
c10c39b5d6
|
13.5.2-2 baseline
Former-commit-id: 8dcd159377 [formerly 8cde3b2b54] [formerly 4a47fb97c5] [formerly 9e4bf0cf2e [formerly 4a47fb97c5 [formerly 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9]]]
Former-commit-id: 9e4bf0cf2e
Former-commit-id: 8411cf39c13b7f63f746f4a1b8806ba15bfa7510 [formerly 5de6d566f0]
Former-commit-id: 12b0ab91fd
|
2013-08-29 15:01:29 -04:00 |
|
Steve Harris
|
b4e006162f
|
13.5.2-1 baseline
Former-commit-id: 3cd0b2dfc6 [formerly 894d2425b2] [formerly 73dd0f166c] [formerly 542b2c3d18 [formerly 73dd0f166c [formerly a362ca91ee5972a1501a2842191fbe2e23feac9c]]]
Former-commit-id: 542b2c3d18
Former-commit-id: 43ff166b6d3df833e29603f504019d7b3776a1d1 [formerly 4ecb349ed8]
Former-commit-id: 43af1b227a
|
2013-08-28 09:43:48 -04:00 |
|
Steve Harris
|
ff31991527
|
13.5.1-18 baseline
Former-commit-id: 80d8236464 [formerly d931b80e70] [formerly afb34814dd] [formerly 0a7acf96c7 [formerly afb34814dd [formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]]]
Former-commit-id: 0a7acf96c7
Former-commit-id: bef853d6001eb232a3c91986195c4ab5e86bc9cd [formerly 2f9aa87a9f]
Former-commit-id: 261b1da9d6
|
2013-08-22 09:12:43 -04:00 |
|
Steve Harris
|
4fd4093539
|
13.5.1-17 baseline
Former-commit-id: fb9ab08255 [formerly 2d882ccb54] [formerly 9dd7dc5d20] [formerly b210c90245 [formerly 9dd7dc5d20 [formerly c5d75a6473b2659b9ac1054a1160c921bd8c1c16]]]
Former-commit-id: b210c90245
Former-commit-id: c4d2af6f3a1f86a3300795dc1db7d6c9323eac0b [formerly a192a3ebb1]
Former-commit-id: 7c0cf13ea8
|
2013-08-19 16:34:24 -04:00 |
|
Bryan Kowal
|
e63473681c
|
Issue #2163 - build the java and awips2-common-base rpms
Former-commit-id: fa69d98320 [formerly dd55894802] [formerly a3a5c799fc] [formerly 7f8226d319 [formerly a3a5c799fc [formerly dcd9e70f94deda8a26e8df00ee9bc8ffc13abe43]]]
Former-commit-id: 7f8226d319
Former-commit-id: 13c28d981888a56ba89f41db6a1eb715dc47ee3c [formerly 110fb14b91]
Former-commit-id: 178b4904ef
|
2013-08-15 15:40:18 -05:00 |
|
Bryan Kowal
|
38c4f03c0a
|
Issue #2163 - copy additional httpd source to the rpm SOURCES directory
Former-commit-id: 18a3f63616 [formerly 4e3c577c56] [formerly 32f3e63bd5] [formerly 382cb87fa3 [formerly 32f3e63bd5 [formerly b22a36d559ba6db6d1bd3d3c6785984353449a92]]]
Former-commit-id: 382cb87fa3
Former-commit-id: bd8c04417fd168b2227cc23f892d33fc380013fa [formerly 50ab20be95]
Former-commit-id: 6a129d3a96
|
2013-08-15 15:40:05 -05:00 |
|
Bryan Kowal
|
2a9f4d41c9
|
Issue #2163 - remaining RHEL6 RPM changes
- Amend: update build.sh to build the full set of rpms
Change-Id: I182f23ffc67f2dc84a0e5436b2830311e29f534f
Conflicts:
rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0
Former-commit-id: 23fb13a41c [formerly 7d7511af9b] [formerly 19d80d96c3] [formerly c0458d512d [formerly 19d80d96c3 [formerly 45adc2b64e9037273e1013631ba7a8fbef400c35]]]
Former-commit-id: c0458d512d
Former-commit-id: b7074896173a8852588739234ce215ff22e0dba5 [formerly 6b305d4ea3]
Former-commit-id: f68943aeef
|
2013-08-15 15:39:37 -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 |
|
Bryan Kowal
|
33b6f03899
|
Issue #2163 - remaining rpms that are not dependent on nativeLib and cleanup
Conflicts:
RadarServer/build.rcm/build.xml
cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
Former-commit-id: fb1feea107 [formerly 683d7e5b19] [formerly c1dab22fdb] [formerly 94eacfc460 [formerly c1dab22fdb [formerly 58a80b4b6d31d11b0ca722545bfd788a2feee488]]]
Former-commit-id: 94eacfc460
Former-commit-id: b8d6af6f18e6e9e34cf5082362f7b792032c2de6 [formerly 75c6d4ebf6]
Former-commit-id: 53124c5e02
|
2013-08-15 15:30:05 -05:00 |
|