Commit graph

10 commits

Author SHA1 Message Date
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
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
Bryan Kowal
b32933f72a Issue #2163 - additional RHEL6 changes
- updated edexBridge to use the QPID 0.18 API
- awips2-ldm is now ready for RHEL 6
- the QPID 0.18 rpms now build for RHEL 6
- disabled the build of QPID 0.7
- awips2-qpid-lib (new to RHEL 6) is now ready


Former-commit-id: 5feab7c0be [formerly bbca63a8b8] [formerly 5feab7c0be [formerly bbca63a8b8] [formerly 36eca9bbfb [formerly d0f73c3852e45ec7b2363b46c77a94d7b3a47143]]]
Former-commit-id: 36eca9bbfb
Former-commit-id: 9b62e39fff [formerly 1f5e92aac9]
Former-commit-id: 858a41c50d
2013-08-15 15:25:52 -05:00
Steve Harris
513c089375 13.5.1-7 baseline
Former-commit-id: 630705aa3f [formerly bf58a81b38] [formerly 630705aa3f [formerly bf58a81b38] [formerly 86ce1248c2 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]
Former-commit-id: 86ce1248c2
Former-commit-id: cb50a0028d [formerly f9c9aecba5]
Former-commit-id: eff4fb29dd
2013-07-18 12:07:22 -04:00
Steve Harris
c05a6c8b50 13.5.1-4 baseline
Former-commit-id: c56be8a332 [formerly 70e4ff30a6] [formerly c56be8a332 [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 640b022e84 [formerly f658320357]
Former-commit-id: c183e08922
2013-06-28 09:46:25 -04:00
Steve Harris
722e428c74 13.4.1-1 baseline
Former-commit-id: f95e0ad10b [formerly 2f517b7713] [formerly f95e0ad10b [formerly 2f517b7713] [formerly 00332e6305 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]]
Former-commit-id: 00332e6305
Former-commit-id: 0e950655f1 [formerly 4accbb80db]
Former-commit-id: 4001e050e7
2013-04-24 17:15:55 -05:00
Steve Harris
74b66d9683 12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae [formerly a4e519f3cd]
Former-commit-id: 8cd5974f4c
2012-04-18 15:18:16 -05:00
root
e2ecdcfe33 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59 [formerly 3360eb6c5f]
Former-commit-id: 377dcd10b9
2012-01-06 08:55:05 -06:00