Commit graph

5 commits

Author SHA1 Message Date
Bryan Kowal
7bd9ea3d30 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: bb5acf7c11 [formerly c125b5b053] [formerly bb5acf7c11 [formerly c125b5b053] [formerly 9829477ced [formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]]]
Former-commit-id: 9829477ced
Former-commit-id: 0f825df590 [formerly ef789bf912]
Former-commit-id: 0efd4c7c50
2013-09-30 18:00:31 -05:00
Bryan Kowal
2e6116a952 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: 683d7e5b19 [formerly c1dab22fdb] [formerly 683d7e5b19 [formerly c1dab22fdb] [formerly 94eacfc460 [formerly 58a80b4b6d31d11b0ca722545bfd788a2feee488]]]
Former-commit-id: 94eacfc460
Former-commit-id: 53124c5e02 [formerly 75c6d4ebf6]
Former-commit-id: eab659f961
2013-08-15 15:30:05 -05:00
Bryan Kowal
4d346ee4a1 Issue #1924 - add spring extensions to awips2-groovy
Change-Id: Idb3acba281a02f08be71442f014e471e0766d728

Former-commit-id: 8198a78352 [formerly 180e01cf4c] [formerly 8198a78352 [formerly 180e01cf4c] [formerly dbe58fa63d [formerly 550843c669cd2a10901c3e958f37f74e9bbd6332]]]
Former-commit-id: dbe58fa63d
Former-commit-id: a67872d4fc [formerly 44740b014b]
Former-commit-id: 1463a53721
2013-06-13 11:18:23 -05:00
Steve Harris
859965fc9d 13.5.1-1 baseline
Former-commit-id: 6384018950 [formerly 998961612c] [formerly 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 0aab285b8a [formerly 30ba1d634e]
Former-commit-id: 146c5e8940
2013-06-10 15:17:17 -04:00
Bryan Kowal
41a966403f Issue #1934 - add groovy to the AWIPS II Baseline as awips2-groovy.
Former-commit-id: f410bd93c4 [formerly 75025909de] [formerly f410bd93c4 [formerly 75025909de] [formerly 47dc8016cb [formerly 2333bcbb65474dc625ee594b750159a32b83a946]]]
Former-commit-id: 47dc8016cb
Former-commit-id: 3a912d2003 [formerly 96475cf4ca]
Former-commit-id: 5a66175950
2013-04-28 19:59:09 -05:00