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 |
|
Bryan Kowal
|
7d66f1186d
|
Increment python release for gridslice update.
Former-commit-id: f413677106 [formerly 5f634773fe ] [formerly f413677106 [formerly 5f634773fe ] [formerly c48a946923 [formerly 5c5a81739c64ff1ab7f8812be8ac9390e8d85588]]]
Former-commit-id: c48a946923
Former-commit-id: 869781248b [formerly f7438d4fa6 ]
Former-commit-id: e39159052c
|
2013-11-20 17:40:18 -06:00 |
|
Ron Anderson
|
e2f54e78d0
|
Issue #2488 Change to use DejaVu fonts
Change-Id: I82f4b93f340bca0e6dfa4f9c14a9890644c9f224
Former-commit-id: 7a3c7d530e [formerly d72119409e ] [formerly 7a3c7d530e [formerly d72119409e ] [formerly 633137d8c0 [formerly 396cd96c02521a33c65fa9e447275307c2d6168c]]]
Former-commit-id: 633137d8c0
Former-commit-id: 769df41dea [formerly f6b9e69738 ]
Former-commit-id: a731f80011
|
2013-11-20 13:43:25 -06:00 |
|
Brian Clements
|
9d3df8f842
|
Issue #2495 changed gridslice to use correct dimension datatype
Former-commit-id: 4c3453a657 [formerly aa24bc6fce ] [formerly 4c3453a657 [formerly aa24bc6fce ] [formerly 5e7f2f0bdf [formerly ad33e0ef6530c5528cfa5a349c34a1d11c8c453b]]]
Former-commit-id: 5e7f2f0bdf
Former-commit-id: 90601f6ff8 [formerly 05b2a015cb ]
Former-commit-id: a8c2c5870c
|
2013-11-19 17:53:39 -06:00 |
|
Steve Harris
|
fbe9de41ad
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: d1b2cdd566 [formerly 65ebfc1a18 ] [formerly d1b2cdd566 [formerly 65ebfc1a18 ] [formerly c0bb3a1102 [formerly c333fe23736110bcb273aafd90ee6551ff7e921d]]]
Former-commit-id: c0bb3a1102
Former-commit-id: eff32cfbf3 [formerly e8c6af3060 ]
Former-commit-id: 70536b40ba
|
2013-11-19 15:45:06 -06:00 |
|
Steve Harris
|
ea65181d19
|
14.1.1-10 baseline
Former-commit-id: 8251107646 [formerly ca0f65bd9a ] [formerly 8251107646 [formerly ca0f65bd9a ] [formerly 9248695a1f [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]]
Former-commit-id: 9248695a1f
Former-commit-id: e35ec60f7e [formerly ef6e0b0304 ]
Former-commit-id: 36d788890a
|
2013-11-19 16:40:25 -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 |
|
Greg Armendariz
|
8809254168
|
Merge "Issue #2547 - fix RHEL6 nativeLib build in 14.1.1" into omaha_14.1.1
Former-commit-id: 06e3f849f0 [formerly 83ac36721b ] [formerly 06e3f849f0 [formerly 83ac36721b ] [formerly 3f6281fdbe [formerly bb6b56a08a09a01a7e6c5a256c16ac246214818a]]]
Former-commit-id: 3f6281fdbe
Former-commit-id: b7c3a7e850 [formerly ce0a05242f ]
Former-commit-id: 977e0fab0e
|
2013-11-13 15:30:55 -06:00 |
|
Steve Harris
|
661dbe2860
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: eb470599f3 [formerly 0a37219d2a ] [formerly eb470599f3 [formerly 0a37219d2a ] [formerly 2e7a594d51 [formerly ebde6dc849a1ca9753f959423109186c836b4525]]]
Former-commit-id: 2e7a594d51
Former-commit-id: 80c709b3f4 [formerly bc45f3668b ]
Former-commit-id: 1fdc64c7e7
|
2013-11-13 11:34:17 -06:00 |
|
Steve Harris
|
d2104614be
|
14.1.1-8 baseline
Former-commit-id: 90bc008a50 [formerly aa6c977e7b ] [formerly 90bc008a50 [formerly aa6c977e7b ] [formerly c7d36eb6ad [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]]
Former-commit-id: c7d36eb6ad
Former-commit-id: b7ca6163e3 [formerly 0123596fd9 ]
Former-commit-id: 42ece4fb6a
|
2013-11-13 12:32:17 -05:00 |
|
Bryan Kowal
|
cfb3717a61
|
Issue #2547 - fix RHEL6 nativeLib build in 14.1.1
Former-commit-id: b2272ad695 [formerly a51231058a ] [formerly b2272ad695 [formerly a51231058a ] [formerly e3639da703 [formerly 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f]]]
Former-commit-id: e3639da703
Former-commit-id: b2c63727ba [formerly 48d5d8c3a1 ]
Former-commit-id: a575f41589
|
2013-11-12 19:57:25 -06:00 |
|
Steve Harris
|
02311b3b5d
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: b4a37cc39d [formerly 51ff88796c ] [formerly b4a37cc39d [formerly 51ff88796c ] [formerly 3236374cc0 [formerly 2a95ac857fe960ed2147545731acc3c093bb73b5]]]
Former-commit-id: 3236374cc0
Former-commit-id: 9141c578ff [formerly 224d25217b ]
Former-commit-id: 8f4de4a210
|
2013-11-07 11:37:25 -06:00 |
|
Steve Harris
|
43b93250c0
|
14.1.1-7 baseline (addendum 1)
deleted ./ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
Former-commit-id: abbecba957 [formerly 2d36bc2c1f ] [formerly abbecba957 [formerly 2d36bc2c1f ] [formerly b835dad501 [formerly 07f7c24804028aed71fc29cdf6f163a9e9d15623]]]
Former-commit-id: b835dad501
Former-commit-id: a72bb1669f [formerly 155bc487ff ]
Former-commit-id: fdad37d271
|
2013-11-07 12:09:23 -05:00 |
|
Steve Harris
|
878d57675c
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: cdb514cb5c [formerly c218866826 ] [formerly cdb514cb5c [formerly c218866826 ] [formerly d8afc4c58c [formerly 2d5b1f7563e0f8dbd0dadcfa89cad35ba6fac98b]]]
Former-commit-id: d8afc4c58c
Former-commit-id: a48b85a0b2 [formerly 7c71117a50 ]
Former-commit-id: ff548f8557
|
2013-11-06 13:22:12 -06:00 |
|
Steve Harris
|
cfb3194426
|
14.1.1-7 baseline
Former-commit-id: 80614c0e52 [formerly 3328e2dd1d ] [formerly 80614c0e52 [formerly 3328e2dd1d ] [formerly 4fff87723f [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]
Former-commit-id: 4fff87723f
Former-commit-id: b694612fe0 [formerly 48df058653 ]
Former-commit-id: 647b908fed
|
2013-11-06 14:16:14 -05:00 |
|
Steve Harris
|
0aa90a7855
|
14.1.1-6 baseline
Former-commit-id: 946a9be17e [formerly 0cb2978c13 ] [formerly 946a9be17e [formerly 0cb2978c13 ] [formerly 6067af4252 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]]
Former-commit-id: 6067af4252
Former-commit-id: e86a0aa489 [formerly 26da1ce793 ]
Former-commit-id: 270c5f1a2d
|
2013-11-06 14:08:33 -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
|
09eee9a31a
|
14.1.1-5 baseline
Former-commit-id: 933e7395ac [formerly 877776a04c ] [formerly 933e7395ac [formerly 877776a04c ] [formerly f4c53b02fa [formerly b643d85f65fe0393024cf43473fd567d8b7b2b65]]]
Former-commit-id: f4c53b02fa
Former-commit-id: 3b738baba8 [formerly af2707389c ]
Former-commit-id: 92851705fc
|
2013-10-28 12:14:27 -04: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 |
|
Bryan Kowal
|
15cb18c19f
|
Issue #2396 - updated grib2.so to use a newer version of g2clib
Former-commit-id: 2ad7db4f5d [formerly b7b11dc747 ] [formerly 2ad7db4f5d [formerly b7b11dc747 ] [formerly 9a472e1bbe [formerly 6730ef07554b6e335427bcf08dded302fcc4a398]]]
Former-commit-id: 9a472e1bbe
Former-commit-id: b1bdf0dbc5 [formerly f892849313 ]
Former-commit-id: 83c0c7e365
|
2013-10-16 12:54:58 -05:00 |
|
Bryan Kowal
|
b8c2ece19c
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
rpms/awips2.qpid/0.18/deploy.builder/build.sh
Former-commit-id: 96c800f3f4 [formerly 5eba3290c8 ] [formerly 96c800f3f4 [formerly 5eba3290c8 ] [formerly 8f14318bc7 [formerly d6b9ed6ec29c5285ec454fb1c1e65e64a096edb9]]]
Former-commit-id: 8f14318bc7
Former-commit-id: 72ed6c5f7a [formerly 53af4c7284 ]
Former-commit-id: 5477a06781
|
2013-10-08 10:35:03 -05:00 |
|
Steve Harris
|
e1f7463a41
|
13.5.2-8 baseline
Former-commit-id: 8ba7d392d6 [formerly 94aa71fcd1 ] [formerly 8ba7d392d6 [formerly 94aa71fcd1 ] [formerly 18325949fb [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]
Former-commit-id: 18325949fb
Former-commit-id: 21b84f0290 [formerly d89fbf73d9 ]
Former-commit-id: 088eb89ca7
|
2013-10-04 11:30:03 -04:00 |
|
Bryan Kowal
|
e874f182ef
|
Issue #2432 - fix qpid build
Former-commit-id: fdf31a8a6e [formerly 5db663c2ae ] [formerly fdf31a8a6e [formerly 5db663c2ae ] [formerly 6736231873 [formerly ef1e8ac70bec7c9d242c5aed0cf07acaaf2bb31b]]]
Former-commit-id: 6736231873
Former-commit-id: bd93d164c7 [formerly f100a9c96a ]
Former-commit-id: 751cd48248
|
2013-10-03 08:33:15 -05:00 |
|
Steve Harris
|
160a5819f9
|
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: 59f753ee0d [formerly fc0cdf4996 ] [formerly 59f753ee0d [formerly fc0cdf4996 ] [formerly 84ad96f2e0 [formerly 5b5cb6d6fb5d492d9244e3fa50f84710a07811b3]]]
Former-commit-id: 84ad96f2e0
Former-commit-id: c2fa80310e [formerly c6a4241c5b ]
Former-commit-id: 9aa19b42b5
|
2013-10-01 15:34:01 -05:00 |
|
Steve Harris
|
79d71e33d0
|
13.5.2-7 baseline
Former-commit-id: b5cb693619 [formerly 0f8fc513bf ] [formerly b5cb693619 [formerly 0f8fc513bf ] [formerly a212c30bd7 [formerly dace09a228fa4bef6bddc1388f12d35adcbd7543]]]
Former-commit-id: a212c30bd7
Former-commit-id: 06ba0dbf6c [formerly 02d6145782 ]
Former-commit-id: 5e4023b974
|
2013-09-30 13:05:31 -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
|
129f271175
|
Issue #2334 - only free memory when we actually no longer care about its contents.
Change-Id: I49fc1e514c65065ddb6e834a6aeed41f466341f4
Former-commit-id: 0d9fe24f7b [formerly 5e334a7b0e ] [formerly 0d9fe24f7b [formerly 5e334a7b0e ] [formerly 706920aed6 [formerly ac3d847501e41668f923f2ea40572c3894e8dc79]]]
Former-commit-id: 706920aed6
Former-commit-id: 0f702bf515 [formerly 34f85b41c2 ]
Former-commit-id: efe4ee8b48
|
2013-09-19 17:32:08 -05:00 |
|
Bryan Kowal
|
5889733924
|
Issue #2382 - fix qpid amqp path
Former-commit-id: b84cb9106f [formerly b9f4e93687 ] [formerly b84cb9106f [formerly b9f4e93687 ] [formerly b002df8a06 [formerly 263ce6e82d1ecf3164961b599c2d4aac7d61f783]]]
Former-commit-id: b002df8a06
Former-commit-id: eb6cc0320c [formerly 8ce22ec91a ]
Former-commit-id: f10a1a5ac2
|
2013-09-17 17:51:43 -05:00 |
|
Steve Harris
|
fb70a4b4b0
|
13.5.2-5 baseline
Former-commit-id: 31111f4f52 [formerly 0745317d53 ] [formerly 31111f4f52 [formerly 0745317d53 ] [formerly 67cceefe5d [formerly ed50e9426fd099fd9336b7bfc8d0c5c35f8500f4]]]
Former-commit-id: 67cceefe5d
Former-commit-id: c8ead44672 [formerly 6202bacae1 ]
Former-commit-id: c79546c83a
|
2013-09-16 10:14:25 -04:00 |
|
Bryan Kowal
|
fc6554a658
|
Issue #2356 - update httpd-collaboration configuration for new httpd version and RHEL6
Former-commit-id: ac9a5ad4d9 [formerly 21d395a914 ] [formerly ac9a5ad4d9 [formerly 21d395a914 ] [formerly 646d61335d [formerly 21ac850e9cf61f58a324f17ee687f50cda7c5804]]]
Former-commit-id: 646d61335d
Former-commit-id: 118ea128c6 [formerly 8d936cbfc3 ]
Former-commit-id: 499377b332
|
2013-09-12 13:08:07 -05:00 |
|
Steve Harris
|
609926f1f4
|
13.5.2-4 baseline
Former-commit-id: 595e7bc0d9 [formerly e3c935d48b ] [formerly 595e7bc0d9 [formerly e3c935d48b ] [formerly 58c6821427 [formerly da631849bc9eaaa5c83c2393520b6099413107a5]]]
Former-commit-id: 58c6821427
Former-commit-id: 4c6790f10f [formerly abed443b59 ]
Former-commit-id: e2398f74e5
|
2013-09-12 11:13:59 -04:00 |
|
Bryan Kowal
|
f4dbb79115
|
Issue #2356 - pypies configuration updates and RHEL6 compatibility updates
Former-commit-id: 938e49d7f1 [formerly 826d5e1c78 ] [formerly 938e49d7f1 [formerly 826d5e1c78 ] [formerly ca9597b66a [formerly 2f1617632a5d24748e915066a7209839bca3f68a]]]
Former-commit-id: ca9597b66a
Former-commit-id: baab46f8d1 [formerly 1a59a35500 ]
Former-commit-id: c2fbbdc727
|
2013-09-11 17:34:19 -05:00 |
|
Bryan Kowal
|
89ee59610b
|
Issue #2343 - resolve AWIPS II httpd depenency issue
Former-commit-id: b6d787103b [formerly 18756316ce ] [formerly b6d787103b [formerly 18756316ce ] [formerly 9a370ca614 [formerly b5081a38c6d90f47a625fde975f717ff4f63215f]]]
Former-commit-id: 9a370ca614
Former-commit-id: 3e27389e5b [formerly aa88d48c30 ]
Former-commit-id: 00696f6876
|
2013-09-10 17:04:35 -05:00 |
|
Bryan Kowal
|
33de2c0b6b
|
Issue #2163 - disable Java 7 build
Former-commit-id: e062b24680 [formerly f8c0886d52 ] [formerly e062b24680 [formerly f8c0886d52 ] [formerly 101fd09211 [formerly eb2bba4ac4a43eff894a23f714c8b71fba20419c]]]
Former-commit-id: 101fd09211
Former-commit-id: 4f859e716c [formerly 4c1a283575 ]
Former-commit-id: 2174e72247
|
2013-09-09 09:46:09 -05:00 |
|
Bryan Kowal
|
39bd67265e
|
Issue #2163 - convert the few remaining python rpms for 14.1.1; remove 13.6 feature modifications
Former-commit-id: 6578b9a7de [formerly 1adf764747 ] [formerly 6578b9a7de [formerly 1adf764747 ] [formerly 79e88c19aa [formerly 4503735d3a05071878683f4a523d0dbd37e47ea3]]]
Former-commit-id: 79e88c19aa
Former-commit-id: 2a35fb001d [formerly aa8eb47b95 ]
Former-commit-id: 8dad5af165
|
2013-09-06 12:30:01 -05:00 |
|
Bryan Kowal
|
c9a29b19ff
|
Issue #2163 - fix Eclipse CDT metadata after merge
Former-commit-id: ea4cbc4c9a [formerly 351824fb85 ] [formerly ea4cbc4c9a [formerly 351824fb85 ] [formerly b88a13d3b5 [formerly 7502d12a78c68f56e33a41bae7b3346d195ad79f]]]
Former-commit-id: b88a13d3b5
Former-commit-id: 1918d5e96a [formerly 4670dcb9a7 ]
Former-commit-id: 8e1df0bda0
|
2013-09-04 14:49:47 -05:00 |
|
Bryan Kowal
|
7ea8a63f32
|
Issue #2163 - build dynamicserialize and ufpy with the redhat 6 build
Former-commit-id: 41ab242c2d [formerly a02d910023 ] [formerly 41ab242c2d [formerly a02d910023 ] [formerly 03cadc5aa9 [formerly 422e9b611535e9c20338041e0e1af62d38aab047]]]
Former-commit-id: 03cadc5aa9
Former-commit-id: 9c890422fa [formerly 65bb1ec74b ]
Former-commit-id: bcb07a8f39
|
2013-09-04 13:48:08 -05:00 |
|
Steve Harris
|
41a6eebf23
|
13.5.2-3 baseline
Former-commit-id: 91fb128c17 [formerly 9fdd0e51a0 ] [formerly 91fb128c17 [formerly 9fdd0e51a0 ] [formerly bae0a20b8e [formerly 51ecc8e9e15940e6cbe2c5da55edc5860ea8b0ca]]]
Former-commit-id: bae0a20b8e
Former-commit-id: 8ac02ce922 [formerly c666ac7283 ]
Former-commit-id: ccc5095251
|
2013-09-04 14:13:29 -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 |
|
Steve Harris
|
5bb983c645
|
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: 433cc78081 [formerly 18ee1d0092 ] [formerly 433cc78081 [formerly 18ee1d0092 ] [formerly 7fe19d898c [formerly b2674e0f626c643f0f81f865ea56351af2531c6a]]]
Former-commit-id: 7fe19d898c
Former-commit-id: 55bbf0f747 [formerly 0514103d87 ]
Former-commit-id: 482b9d838d
|
2013-09-03 16:05:44 -05:00 |
|
Bryan Kowal
|
a8898ec348
|
Issue #2163 - RHEL6 14.1.1 build updates
Former-commit-id: 17d652a8dd [formerly 9415560b38 ] [formerly 17d652a8dd [formerly 9415560b38 ] [formerly ab3485a3ed [formerly b0e47f4548c235a7cbaefc12e97264ce4c782fce]]]
Former-commit-id: ab3485a3ed
Former-commit-id: 751f005228 [formerly 17b8ded082 ]
Former-commit-id: 6de01af674
|
2013-09-03 13:46:19 -05:00 |
|
Steve Harris
|
db64b2e2d9
|
13.5.2-2 baseline
Former-commit-id: 8cde3b2b54 [formerly 4a47fb97c5 ] [formerly 8cde3b2b54 [formerly 4a47fb97c5 ] [formerly 9e4bf0cf2e [formerly 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9]]]
Former-commit-id: 9e4bf0cf2e
Former-commit-id: 12b0ab91fd [formerly 5de6d566f0 ]
Former-commit-id: 180e042b5d
|
2013-08-29 15:01:29 -04:00 |
|
Steve Harris
|
1900cef156
|
13.5.2-1 baseline
Former-commit-id: 894d2425b2 [formerly 73dd0f166c ] [formerly 894d2425b2 [formerly 73dd0f166c ] [formerly 542b2c3d18 [formerly a362ca91ee5972a1501a2842191fbe2e23feac9c]]]
Former-commit-id: 542b2c3d18
Former-commit-id: 43af1b227a [formerly 4ecb349ed8 ]
Former-commit-id: 4a9a91ce2e
|
2013-08-28 09:43:48 -04:00 |
|
Steve Harris
|
6c258a0b7c
|
13.5.1-18 baseline
Former-commit-id: d931b80e70 [formerly afb34814dd ] [formerly d931b80e70 [formerly afb34814dd ] [formerly 0a7acf96c7 [formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]]]
Former-commit-id: 0a7acf96c7
Former-commit-id: 261b1da9d6 [formerly 2f9aa87a9f ]
Former-commit-id: cde7f2a59c
|
2013-08-22 09:12:43 -04:00 |
|
Steve Harris
|
4bcb06cd63
|
13.5.1-17 baseline
Former-commit-id: 2d882ccb54 [formerly 9dd7dc5d20 ] [formerly 2d882ccb54 [formerly 9dd7dc5d20 ] [formerly b210c90245 [formerly c5d75a6473b2659b9ac1054a1160c921bd8c1c16]]]
Former-commit-id: b210c90245
Former-commit-id: 7c0cf13ea8 [formerly a192a3ebb1 ]
Former-commit-id: 815bfe575c
|
2013-08-19 16:34:24 -04:00 |
|
Bryan Kowal
|
cf5293fe91
|
Issue #2163 - build the java and awips2-common-base rpms
Former-commit-id: dd55894802 [formerly a3a5c799fc ] [formerly dd55894802 [formerly a3a5c799fc ] [formerly 7f8226d319 [formerly dcd9e70f94deda8a26e8df00ee9bc8ffc13abe43]]]
Former-commit-id: 7f8226d319
Former-commit-id: 178b4904ef [formerly 110fb14b91 ]
Former-commit-id: 64fe4b6760
|
2013-08-15 15:40:18 -05:00 |
|
Bryan Kowal
|
a533b3b52c
|
Issue #2163 - copy additional httpd source to the rpm SOURCES directory
Former-commit-id: 4e3c577c56 [formerly 32f3e63bd5 ] [formerly 4e3c577c56 [formerly 32f3e63bd5 ] [formerly 382cb87fa3 [formerly b22a36d559ba6db6d1bd3d3c6785984353449a92]]]
Former-commit-id: 382cb87fa3
Former-commit-id: 6a129d3a96 [formerly 50ab20be95 ]
Former-commit-id: 2205b4a02f
|
2013-08-15 15:40:05 -05:00 |
|