Commit graph

10 commits

Author SHA1 Message Date
Steve Harris
0514103d87 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: 18ee1d0092 [formerly b2674e0f626c643f0f81f865ea56351af2531c6a]
Former-commit-id: 7fe19d898c
2013-09-03 16:05:44 -05:00
Steve Harris
5de6d566f0 13.5.2-2 baseline
Former-commit-id: 4a47fb97c5 [formerly 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9]
Former-commit-id: 9e4bf0cf2e
2013-08-29 15:01:29 -04: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
Steve Harris
2afb46f814 13.5.1-8 baseline
Former-commit-id: 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]
Former-commit-id: dfbf9a5afe
2013-07-26 09:02:34 -04:00
Steve Harris
72824561cb 12.9.1-5 baseline
Former-commit-id: 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: f2fac39428
2012-08-21 15:27:03 -05:00
Bryan Kowal
033a4e237b Issue #202 - Removed questionable 12.2.1 changes to the soon-to-be deprecated rpm core build.sh script; the gfesuite rpms will now manually created needed directories. At one time the directories were probably baselined until we switched to git.
Former-commit-id: 4d8d3d4d00 [formerly 75cac6f9bf1dc237c4131e47912c595adb6aa0d7]
Former-commit-id: c803afd454
2012-03-07 10:22:40 -06:00
Bryan Kowal
7f1b468010 Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: 65e1e4ee0b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]
Former-commit-id: ea1c82452b
2012-01-20 13:38:00 -06:00
Matt Nash
1faae42484 Moving 12.1.1 into ss_sync
Former-commit-id: 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: c83e5ff474
2012-01-19 11:53:12 -06:00
Bryan Kowal
06187b93be Issue #34 - merging build changes originally made for the new svn transition into git.
Former-commit-id: 43c3807a32 [formerly 40f016a9f9e605b039d41ed44a59a269caf8a024]
Former-commit-id: 9d64e1df12
2012-01-18 16:00:45 -06:00
root
3360eb6c5f Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 06a8b51d6d
2012-01-06 08:55:05 -06:00