Commit graph

5 commits

Author SHA1 Message Date
Bryan Kowal
ef789bf912 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: c125b5b053 [formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]
Former-commit-id: 9829477ced
2013-09-30 18:00:31 -05:00
Bryan Kowal
75c6d4ebf6 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: c1dab22fdb [formerly 58a80b4b6d31d11b0ca722545bfd788a2feee488]
Former-commit-id: 94eacfc460
2013-08-15 15:30:05 -05:00
Bryan Kowal
44740b014b Issue #1924 - add spring extensions to awips2-groovy
Change-Id: Idb3acba281a02f08be71442f014e471e0766d728

Former-commit-id: 180e01cf4c [formerly 550843c669cd2a10901c3e958f37f74e9bbd6332]
Former-commit-id: dbe58fa63d
2013-06-13 11:18:23 -05:00
Steve Harris
30ba1d634e 13.5.1-1 baseline
Former-commit-id: 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]
Former-commit-id: fe872355a7
2013-06-10 15:17:17 -04:00
Bryan Kowal
96475cf4ca Issue #1934 - add groovy to the AWIPS II Baseline as awips2-groovy.
Former-commit-id: 75025909de [formerly 2333bcbb65474dc625ee594b750159a32b83a946]
Former-commit-id: 47dc8016cb
2013-04-28 19:59:09 -05:00