Commit graph

16 commits

Author SHA1 Message Date
Bryan Kowal
4e53eadca4 Issue #708 - it is now possible to build edex rpms in the new baseline repository.
Former-commit-id: 80adc8bbfd [formerly 11a1c4f35f] [formerly 973ceff9a7] [formerly f79134499e [formerly 973ceff9a7 [formerly 0932e1173258d916a6a1caae5c943903d830c2af]]]
Former-commit-id: f79134499e
Former-commit-id: f01648537abdc924d90c96168fabc6a20dc2d827 [formerly 1acbc16759]
Former-commit-id: 872a3a5f60
2012-06-20 11:22:58 -05:00
Steve Harris
1f521a70b3 12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]
Former-commit-id: 97c4db937e
2012-06-08 13:39:48 -05:00
Steve Harris
98d8b3f188 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]
Former-commit-id: a2a6a18fae
2012-04-18 15:18:16 -05:00
Bryan Kowal
2fa51704a0 Issue #202 - remove obsolete edex prefix verifications.
Former-commit-id: 48d5fd8ee6 [formerly 475849bd91] [formerly 1e3e31a657] [formerly c2cd292c32 [formerly 1e3e31a657 [formerly 6984db8c852a552867b1b8159637d96dcd83ab5a]]]
Former-commit-id: c2cd292c32
Former-commit-id: e59528ebf20a3f9e9fafe944e7bf90cae2f7d19f [formerly 49a30a5b1a]
Former-commit-id: d4367098a7
2012-02-23 16:46:48 -06:00
Bryan Kowal
70afebc3a9 Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: e723d50244 [formerly 4881def0e9] [formerly 787a2bdbc4f7f2536dc9e89bd790b020c7dfbe6d [formerly bae0cb555e]] [formerly e135f4508d [formerly bae0cb555e [formerly 10339dcba7c9ae535766e5c5dddac57ddb3f99c4]]]
Former-commit-id: e135f4508d
Former-commit-id: a9d31b1493dd373f2fd8124779bfc4579645858b [formerly 5c86773a77]
Former-commit-id: fa23b673c4
2012-02-23 14:20:50 -06:00
Steve Harris
fbb5de922a Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration
Conflicts:
	edexOsgi/build.edex/deploy-install.xml

Seems to have solved itself or was not actually a conflict


Former-commit-id: 0be3703c7e [formerly 4981170462] [formerly dcadf7baa4] [formerly 86e586befe [formerly dcadf7baa4 [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]]
Former-commit-id: 86e586befe
Former-commit-id: 5a0e0d2312e9dc1ae83176f1127db903c68bc140 [formerly 938dc5b21c]
Former-commit-id: 4eb1ef5b0f
2012-02-23 12:38:55 -06:00
Steve Harris
13a3edd4f6 Merging SS OB12.2.1 into ss_sync
Former-commit-id: 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 54be9660f1 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]
Former-commit-id: 54be9660f1
Former-commit-id: 411ab8c69637be6b90bd3e06c4b1ab00caea0eec [formerly 4450cf8963]
Former-commit-id: b55a488ed8
2012-02-22 11:14:43 -06:00
Steve Harris
139d42c594 Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: a811ac888f [formerly 85075e6107] [formerly 94c2ea985b] [formerly 9995d22e25 [formerly 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]]
Former-commit-id: 9995d22e25
Former-commit-id: dccb91e6d6462a59f41fcbab353272041948d51b [formerly aaead73ec5]
Former-commit-id: 610fdf3f4e
2012-02-22 10:12:49 -06:00
Steve Harris
2e0f1d3ecc Merge branch '10-Tech_Blocked' into 104-integration
Conflicts:
	edexOsgi/build.edex/deploy-install.xml
	rpms/awips2.edex/Installer.edex-cots/component.spec

Former-commit-id: eda787edea [formerly d971880b98] [formerly cabf9fd956] [formerly 5e9d2dd367 [formerly cabf9fd956 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]]
Former-commit-id: 5e9d2dd367
Former-commit-id: a529cc7da8a5f072c8a414b5af753a556a2be162 [formerly 33483f3960]
Former-commit-id: b12f5e5d75
2012-02-20 13:03:39 -06:00
Bryan Kowal
e326a29d2f Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: eda0f92b17 [formerly 5754f9dfd8] [formerly 10a0ca252d] [formerly 682c10767d [formerly 10a0ca252d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]]]
Former-commit-id: 682c10767d
Former-commit-id: a057be46f691d8ed25cfea1a37709fd22cddecd5 [formerly 2ba23624b4]
Former-commit-id: cc8c6597a2
2012-02-17 12:17:14 -06:00
Bryan Kowal
afed3a6245 Issue #202 - make edex-cots specs compatible with the branch.
Former-commit-id: 30ef4b72b8 [formerly a19dd6ff33] [formerly 7ca62dc7d6] [formerly 1855bbcbee [formerly 7ca62dc7d6 [formerly 26243249e27ee347933748aa53e9436e32751d9c]]]
Former-commit-id: 1855bbcbee
Former-commit-id: 6cd9f081ec4527ca2d012cbcd22294b93d8b4ee9 [formerly 27c4557e0a]
Former-commit-id: 88b67b4977
2012-02-09 12:14:37 -06:00
Bryan Kowal
53dd09e1d1 Issue #202 - no longer build edex-ncep-nsharp for the ncep branch.
Former-commit-id: d885bdcb6e [formerly b6a8534258] [formerly 998337f9f4] [formerly 2554090d0d [formerly 998337f9f4 [formerly bd0cd789a4c6952aa61b9cef9e61e3f46c7ab462]]]
Former-commit-id: 2554090d0d
Former-commit-id: 1b8e03644eb20289239e3c4e2bb6735b83eea7d8 [formerly 2745f9cac7]
Former-commit-id: b271da085c
2012-01-30 16:01:45 -06:00
Bryan Kowal
69f4822ad1 Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: d537df4ab0 [formerly 4453ad2d10] [formerly 9a1c04ec5f94674baf45e393882ffe09f7582171 [formerly 65e1e4ee0b]] [formerly ea1c82452b [formerly 65e1e4ee0b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]]]
Former-commit-id: ea1c82452b
Former-commit-id: e63dac039e52161602915d3cf34685762acd5d9e [formerly 7f1b468010]
Former-commit-id: 9f6780c4dd
2012-01-20 13:38:00 -06:00
Matt Nash
fa4cd88c90 Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 21d2361f00 [formerly 1faae42484]
Former-commit-id: 82300ccdcf
2012-01-19 11:53:12 -06:00
Bryan Kowal
f19cf1c4ee Issue #34 - merging build changes originally made for the new svn transition into git.
Former-commit-id: 48c7c3b950 [formerly 63f6f44fe1] [formerly 43c3807a32] [formerly 9d64e1df12 [formerly 43c3807a32 [formerly 40f016a9f9e605b039d41ed44a59a269caf8a024]]]
Former-commit-id: 9d64e1df12
Former-commit-id: 9ceb347a77 [formerly 06187b93be]
Former-commit-id: 281be5e0b7
2012-01-18 16:00:45 -06:00
root
9bb8decbcf Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 377dcd10b9 [formerly 3360eb6c5f]
Former-commit-id: 8e80217e59
2012-01-06 08:55:05 -06:00