Steve Harris
b98eb9ffa4
Merge branch 'master_14.1.1' into omaha_14.1.1
...
Former-commit-id: 361e9942cf804578fb3e873229c1cd6fd6689fdf
2013-12-02 16:17:38 -06:00
Steve Harris
71ae71c850
14.1.1-11 baseline
...
Former-commit-id: c32b2b2037c84cc074e7dc5a5a13b93223640d7d
2013-12-02 17:10:10 -05:00
Bryan Kowal
c48a946923
Increment python release for gridslice update.
...
Former-commit-id: 5c5a81739c64ff1ab7f8812be8ac9390e8d85588
2013-11-20 17:40:18 -06:00
Ron Anderson
633137d8c0
Issue #2488 Change to use DejaVu fonts
...
Change-Id: I82f4b93f340bca0e6dfa4f9c14a9890644c9f224
Former-commit-id: 396cd96c02521a33c65fa9e447275307c2d6168c
2013-11-20 13:43:25 -06:00
Brian Clements
5e7f2f0bdf
Issue #2495 changed gridslice to use correct dimension datatype
...
Former-commit-id: ad33e0ef6530c5528cfa5a349c34a1d11c8c453b
2013-11-19 17:53:39 -06:00
Steve Harris
c0bb3a1102
Merge branch 'master_14.1.1' into omaha_14.1.1
...
Former-commit-id: c333fe23736110bcb273aafd90ee6551ff7e921d
2013-11-19 15:45:06 -06:00
Steve Harris
9248695a1f
14.1.1-10 baseline
...
Former-commit-id: 6970b56e5970df5cd40ddfc41470324d652f0afd
2013-11-19 16:40:25 -05:00
Steve Harris
2f0d53c9b2
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: 5388a8206a9f447f2ff9030a9e6cfad76efc4cee
2013-11-15 13:05:40 -06:00
Steve Harris
5a0a40e67c
14.1.1-9 baseline
...
Former-commit-id: 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5
2013-11-15 12:47:49 -05:00
Greg Armendariz
3f6281fdbe
Merge "Issue #2547 - fix RHEL6 nativeLib build in 14.1.1" into omaha_14.1.1
...
Former-commit-id: bb6b56a08a09a01a7e6c5a256c16ac246214818a
2013-11-13 15:30:55 -06:00
Steve Harris
2e7a594d51
Merge branch 'master_14.1.1' into omaha_14.1.1
...
Former-commit-id: ebde6dc849a1ca9753f959423109186c836b4525
2013-11-13 11:34:17 -06:00
Steve Harris
c7d36eb6ad
14.1.1-8 baseline
...
Former-commit-id: 41e87fe87d5074f138649c5ca8053e658488fbd0
2013-11-13 12:32:17 -05:00
Bryan Kowal
e3639da703
Issue #2547 - fix RHEL6 nativeLib build in 14.1.1
...
Former-commit-id: 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f
2013-11-12 19:57:25 -06:00
Steve Harris
3236374cc0
Merge branch 'master_14.1.1' into omaha_14.1.1
...
Former-commit-id: 2a95ac857fe960ed2147545731acc3c093bb73b5
2013-11-07 11:37:25 -06:00
Steve Harris
b835dad501
14.1.1-7 baseline (addendum 1)
...
deleted ./ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
Former-commit-id: 07f7c24804028aed71fc29cdf6f163a9e9d15623
2013-11-07 12:09:23 -05:00
Steve Harris
d8afc4c58c
Merge branch 'master_14.1.1' into omaha_14.1.1
...
Former-commit-id: 2d5b1f7563e0f8dbd0dadcfa89cad35ba6fac98b
2013-11-06 13:22:12 -06:00
Steve Harris
4fff87723f
14.1.1-7 baseline
...
Former-commit-id: 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998
2013-11-06 14:16:14 -05:00
Steve Harris
6067af4252
14.1.1-6 baseline
...
Former-commit-id: 7029e583ef36bf746fddda316ba011e27ed766b4
2013-11-06 14:08:33 -05:00
Bryan Kowal
c76c856340
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: 412bcb0f21b7385a170d14b3a88dd67c91a301a2
2013-10-31 15:23:08 -05:00
Steve Harris
f4c53b02fa
14.1.1-5 baseline
...
Former-commit-id: b643d85f65fe0393024cf43473fd567d8b7b2b65
2013-10-28 12:14:27 -04:00
Steve Harris
99e3707c5b
14.1.1-4 baseline
...
Former-commit-id: 0cda967cc9da9d2a08a0197db23d48c65f03be81
2013-10-28 10:55:16 -04:00
Steve Harris
5739b4f832
14.1.1-3 baseline
...
Former-commit-id: cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03
2013-10-28 10:46:02 -04:00
Bryan Kowal
9a472e1bbe
Issue #2396 - updated grib2.so to use a newer version of g2clib
...
Former-commit-id: 6730ef07554b6e335427bcf08dded302fcc4a398
2013-10-16 12:54:58 -05:00
Bryan Kowal
8f14318bc7
Merge branch 'master_14.1.1' into omaha_14.1.1
...
Conflicts:
rpms/awips2.qpid/0.18/deploy.builder/build.sh
Former-commit-id: d6b9ed6ec29c5285ec454fb1c1e65e64a096edb9
2013-10-08 10:35:03 -05:00
Steve Harris
18325949fb
13.5.2-8 baseline
...
Former-commit-id: 6effdd3f5ce46910c89236306fa33499eada174f
2013-10-04 11:30:03 -04:00
Bryan Kowal
6736231873
Issue #2432 - fix qpid build
...
Former-commit-id: ef1e8ac70bec7c9d242c5aed0cf07acaaf2bb31b
2013-10-03 08:33:15 -05:00
Steve Harris
84ad96f2e0
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: 5b5cb6d6fb5d492d9244e3fa50f84710a07811b3
2013-10-01 15:34:01 -05:00
Steve Harris
a212c30bd7
13.5.2-7 baseline
...
Former-commit-id: dace09a228fa4bef6bddc1388f12d35adcbd7543
2013-09-30 13:05:31 -04:00
Steve Harris
3837fbe670
13.5.2-6 baseline
...
Former-commit-id: 726299a49759971bf9a79ca7598c4f39ecb6721c
2013-09-23 10:03:15 -04:00
Bryan Kowal
706920aed6
Issue #2334 - only free memory when we actually no longer care about its contents.
...
Change-Id: I49fc1e514c65065ddb6e834a6aeed41f466341f4
Former-commit-id: ac3d847501e41668f923f2ea40572c3894e8dc79
2013-09-19 17:32:08 -05:00
Bryan Kowal
b002df8a06
Issue #2382 - fix qpid amqp path
...
Former-commit-id: 263ce6e82d1ecf3164961b599c2d4aac7d61f783
2013-09-17 17:51:43 -05:00
Steve Harris
67cceefe5d
13.5.2-5 baseline
...
Former-commit-id: ed50e9426fd099fd9336b7bfc8d0c5c35f8500f4
2013-09-16 10:14:25 -04:00
Bryan Kowal
646d61335d
Issue #2356 - update httpd-collaboration configuration for new httpd version and RHEL6
...
Former-commit-id: 21ac850e9cf61f58a324f17ee687f50cda7c5804
2013-09-12 13:08:07 -05:00
Steve Harris
58c6821427
13.5.2-4 baseline
...
Former-commit-id: da631849bc9eaaa5c83c2393520b6099413107a5
2013-09-12 11:13:59 -04:00
Bryan Kowal
ca9597b66a
Issue #2356 - pypies configuration updates and RHEL6 compatibility updates
...
Former-commit-id: 2f1617632a5d24748e915066a7209839bca3f68a
2013-09-11 17:34:19 -05:00
Bryan Kowal
9a370ca614
Issue #2343 - resolve AWIPS II httpd depenency issue
...
Former-commit-id: b5081a38c6d90f47a625fde975f717ff4f63215f
2013-09-10 17:04:35 -05:00
Bryan Kowal
101fd09211
Issue #2163 - disable Java 7 build
...
Former-commit-id: eb2bba4ac4a43eff894a23f714c8b71fba20419c
2013-09-09 09:46:09 -05:00
Bryan Kowal
79e88c19aa
Issue #2163 - convert the few remaining python rpms for 14.1.1; remove 13.6 feature modifications
...
Former-commit-id: 4503735d3a05071878683f4a523d0dbd37e47ea3
2013-09-06 12:30:01 -05:00
Bryan Kowal
b88a13d3b5
Issue #2163 - fix Eclipse CDT metadata after merge
...
Former-commit-id: 7502d12a78c68f56e33a41bae7b3346d195ad79f
2013-09-04 14:49:47 -05:00
Bryan Kowal
03cadc5aa9
Issue #2163 - build dynamicserialize and ufpy with the redhat 6 build
...
Former-commit-id: 422e9b611535e9c20338041e0e1af62d38aab047
2013-09-04 13:48:08 -05:00
Steve Harris
bae0a20b8e
13.5.2-3 baseline
...
Former-commit-id: 51ecc8e9e15940e6cbe2c5da55edc5860ea8b0ca
2013-09-04 14:13:29 -04:00
Bryan Kowal
326cae8be4
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: 5fb2f3ae5276385fb65c2102ad7619a855947632
2013-09-04 10:08:21 -05:00
Steve Harris
7fe19d898c
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: b2674e0f626c643f0f81f865ea56351af2531c6a
2013-09-03 16:05:44 -05:00
Bryan Kowal
ab3485a3ed
Issue #2163 - RHEL6 14.1.1 build updates
...
Former-commit-id: b0e47f4548c235a7cbaefc12e97264ce4c782fce
2013-09-03 13:46:19 -05:00
Steve Harris
9e4bf0cf2e
13.5.2-2 baseline
...
Former-commit-id: 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9
2013-08-29 15:01:29 -04:00
Steve Harris
542b2c3d18
13.5.2-1 baseline
...
Former-commit-id: a362ca91ee5972a1501a2842191fbe2e23feac9c
2013-08-28 09:43:48 -04:00
Steve Harris
0a7acf96c7
13.5.1-18 baseline
...
Former-commit-id: f407ad6db2f621a5be95939aea88f49d874d1ab6
2013-08-22 09:12:43 -04:00
Steve Harris
b210c90245
13.5.1-17 baseline
...
Former-commit-id: c5d75a6473b2659b9ac1054a1160c921bd8c1c16
2013-08-19 16:34:24 -04:00
Bryan Kowal
7f8226d319
Issue #2163 - build the java and awips2-common-base rpms
...
Former-commit-id: dcd9e70f94deda8a26e8df00ee9bc8ffc13abe43
2013-08-15 15:40:18 -05:00
Bryan Kowal
382cb87fa3
Issue #2163 - copy additional httpd source to the rpm SOURCES directory
...
Former-commit-id: b22a36d559ba6db6d1bd3d3c6785984353449a92
2013-08-15 15:40:05 -05:00