Commit graph

5 commits

Author SHA1 Message Date
Bryan Kowal
87750ddaef Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/alertviz/customTargets.xml
	cave/build/p2-build.xml
	edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
	edexOsgi/meteolib.jni.linux64/libmeteoLib.so
	javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/ncep_grib2module/.cproject
	nativeLib/rary.meteorological/.cproject
	nativeLib/rary.meteorological/src/dcapeFunc.c
	rpms/awips2.cave/Installer.cave-etc/component.spec
	rpms/awips2.cave/Installer.cave-feature/component.spec
	rpms/awips2.core/Installer.aviation/component.spec
	rpms/awips2.qpid/0.18/deploy.builder/build.sh
	rpms/python.site-packages/Installer.qpid/component.spec

Former-commit-id: 3b7573154c [formerly bb5acf7c11] [formerly c125b5b053] [formerly 3b7573154c [formerly bb5acf7c11] [formerly c125b5b053] [formerly 9829477ced [formerly c125b5b053 [formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]]]]
Former-commit-id: 9829477ced
Former-commit-id: f7009e8d15 [formerly 0f825df590] [formerly c64333277c4eb7175b863b7b0e456d69b1ec8730 [formerly ef789bf912]]
Former-commit-id: 4b8c9fd4d50ca4bb221c690f2c6e35cfe5c34531 [formerly 0efd4c7c50]
Former-commit-id: 7bd9ea3d30
2013-09-30 18:00:31 -05:00
Bryan Kowal
cb7e87d9a4 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 fb1feea107 [formerly 683d7e5b19] [formerly c1dab22fdb] [formerly 94eacfc460 [formerly c1dab22fdb [formerly 58a80b4b6d31d11b0ca722545bfd788a2feee488]]]]
Former-commit-id: 94eacfc460
Former-commit-id: 33b6f03899 [formerly 53124c5e02] [formerly b8d6af6f18e6e9e34cf5082362f7b792032c2de6 [formerly 75c6d4ebf6]]
Former-commit-id: e3b28978c51f9031cb777d8427d123b55b738085 [formerly eab659f961]
Former-commit-id: 2e6116a952
2013-08-15 15:30:05 -05:00
Bryan Kowal
b3ce027cf7 Issue #1924 - add spring extensions to awips2-groovy
Change-Id: Idb3acba281a02f08be71442f014e471e0766d728

Former-commit-id: cf4ffaab21 [formerly 8198a78352] [formerly 180e01cf4c] [formerly cf4ffaab21 [formerly 8198a78352] [formerly 180e01cf4c] [formerly dbe58fa63d [formerly 180e01cf4c [formerly 550843c669cd2a10901c3e958f37f74e9bbd6332]]]]
Former-commit-id: dbe58fa63d
Former-commit-id: 493a8edd2a [formerly a67872d4fc] [formerly 6087296d3ff5f4f2c0979e80d55a74fade6100df [formerly 44740b014b]]
Former-commit-id: 1cc4e6e115aa6d5a2ad1e64f8713e092d86e6725 [formerly 1463a53721]
Former-commit-id: 4d346ee4a1
2013-06-13 11:18:23 -05:00
Steve Harris
97a4c59662 13.5.1-1 baseline
Former-commit-id: 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]]
Former-commit-id: fe872355a7
Former-commit-id: 43b7a9b410 [formerly 0aab285b8a] [formerly 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e]]
Former-commit-id: 83a711e54bdd8cabc147e6ca5222939082f46f9c [formerly 146c5e8940]
Former-commit-id: 859965fc9d
2013-06-10 15:17:17 -04:00
Bryan Kowal
d1b64b61a1 Issue #1934 - add groovy to the AWIPS II Baseline as awips2-groovy.
Former-commit-id: f595d3216a [formerly f410bd93c4] [formerly 75025909de] [formerly f595d3216a [formerly f410bd93c4] [formerly 75025909de] [formerly 47dc8016cb [formerly 75025909de [formerly 2333bcbb65474dc625ee594b750159a32b83a946]]]]
Former-commit-id: 47dc8016cb
Former-commit-id: e008b7e231 [formerly 3a912d2003] [formerly c4f22460c10cff73ffd2f4410848c973f7332d2b [formerly 96475cf4ca]]
Former-commit-id: abc27f798ddb4fa47c416cbd41152576eb83b5b0 [formerly 5a66175950]
Former-commit-id: 41a966403f
2013-04-28 19:59:09 -05:00