xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
33080 commits 31 branches 40 tags 3.8 GiB
Commit graph

124 commits

Author SHA1 Message Date
Bryan Kowal
a9438f6213 Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp. 
Former-commit-id: e723d50244 [formerly 4881def0e9] [formerly bae0cb555e] [formerly e723d50244 [formerly 4881def0e9] [formerly bae0cb555e] [formerly e135f4508d [formerly bae0cb555e [formerly 10339dcba7c9ae535766e5c5dddac57ddb3f99c4]]]]
Former-commit-id: e135f4508d
Former-commit-id: 70afebc3a9 [formerly fa23b673c4] [formerly a9d31b1493dd373f2fd8124779bfc4579645858b [formerly 5c86773a77]]
Former-commit-id: 714a9d69c4598e4a6c8a319b0560c1a948d819b3 [formerly 4a78479648]
Former-commit-id: 511f0efe24
 2012-02-23 14:20:50 -06:00
Bryan Kowal
bae0cb555e Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp. 
Former-commit-id: 10339dcba7c9ae535766e5c5dddac57ddb3f99c4
 2012-02-23 14:20:50 -06:00
Steve Harris
587c928f4e 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 0be3703c7e [formerly 4981170462] [formerly dcadf7baa4] [formerly 86e586befe [formerly dcadf7baa4 [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]]]
Former-commit-id: 86e586befe
Former-commit-id: fbb5de922a [formerly 4eb1ef5b0f] [formerly 5a0e0d2312e9dc1ae83176f1127db903c68bc140 [formerly 938dc5b21c]]
Former-commit-id: a02575690595cf7dbca41fcc8e53a47ab455d3ac [formerly 2c958713b6]
Former-commit-id: 93d99ca49c
 2012-02-23 12:38:55 -06:00
Steve Harris
dcadf7baa4 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: 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637
 2012-02-23 12:38:55 -06:00
Steve Harris
3a4af24369 Merging SS OB12.2.1 into ss_sync 
Former-commit-id: 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 54be9660f1 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]]
Former-commit-id: 54be9660f1
Former-commit-id: 13a3edd4f6 [formerly b55a488ed8] [formerly 411ab8c69637be6b90bd3e06c4b1ab00caea0eec [formerly 4450cf8963]]
Former-commit-id: 3e362da5601c6ec9bcea9275fd2b0a509fb3e7fe [formerly 15c56d11bc]
Former-commit-id: 978d22db50
 2012-02-22 11:14:43 -06:00
Steve Harris
c8aae98741 Merging SS OB12.2.1 into ss_sync 
Former-commit-id: 60f30af0c9e3203e2ff623d420165201dff41601
 2012-02-22 11:14:43 -06:00
Steve Harris
5876e9cbd8 Merge branch 14-NCEP into 'ss_sync' 
Former-commit-id: a811ac888f [formerly 85075e6107] [formerly 94c2ea985b] [formerly a811ac888f [formerly 85075e6107] [formerly 94c2ea985b] [formerly 9995d22e25 [formerly 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]]]
Former-commit-id: 9995d22e25
Former-commit-id: 139d42c594 [formerly 610fdf3f4e] [formerly dccb91e6d6462a59f41fcbab353272041948d51b [formerly aaead73ec5]]
Former-commit-id: e696cc8d41ac682e234429cfacbb076d01f9bf39 [formerly 156ad8471d]
Former-commit-id: 01d72ca3c9
 2012-02-22 10:12:49 -06:00
Steve Harris
94c2ea985b Merge branch 14-NCEP into 'ss_sync' 
Former-commit-id: a04c1c31c89566279953d2a270df8d652a3a82ff
 2012-02-22 10:12:49 -06:00
Steve Harris
f0c1c03fff 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 eda787edea [formerly d971880b98] [formerly cabf9fd956] [formerly 5e9d2dd367 [formerly cabf9fd956 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]]]
Former-commit-id: 5e9d2dd367
Former-commit-id: 2e0f1d3ecc [formerly b12f5e5d75] [formerly a529cc7da8a5f072c8a414b5af753a556a2be162 [formerly 33483f3960]]
Former-commit-id: f7595a0be89f8ab41c20c0d16d038e5e650e4712 [formerly acd7845ebd]
Former-commit-id: bcccffbaa4
 2012-02-20 13:03:39 -06:00
Steve Harris
cabf9fd956 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: f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce
 2012-02-20 13:03:39 -06:00
Bryan Kowal
3476936eac Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync. 
Former-commit-id: eda0f92b17 [formerly 5754f9dfd8] [formerly 10a0ca252d] [formerly eda0f92b17 [formerly 5754f9dfd8] [formerly 10a0ca252d] [formerly 682c10767d [formerly 10a0ca252d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]]]]
Former-commit-id: 682c10767d
Former-commit-id: e326a29d2f [formerly cc8c6597a2] [formerly a057be46f691d8ed25cfea1a37709fd22cddecd5 [formerly 2ba23624b4]]
Former-commit-id: 177408d3d8058b38f3b908359601d7498ff2db8c [formerly 8403801a2b]
Former-commit-id: ce9165ce58
 2012-02-17 12:17:14 -06:00
Bryan Kowal
10a0ca252d Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync. 
Former-commit-id: be16819b50761daa75717bc901f73c66a7ad1af5
 2012-02-17 12:17:14 -06:00
Bryan Kowal
8590880e2f Issue #202 - make edex-cots specs compatible with the branch. 
Former-commit-id: 30ef4b72b8 [formerly a19dd6ff33] [formerly 7ca62dc7d6] [formerly 30ef4b72b8 [formerly a19dd6ff33] [formerly 7ca62dc7d6] [formerly 1855bbcbee [formerly 7ca62dc7d6 [formerly 26243249e27ee347933748aa53e9436e32751d9c]]]]
Former-commit-id: 1855bbcbee
Former-commit-id: afed3a6245 [formerly 88b67b4977] [formerly 6cd9f081ec4527ca2d012cbcd22294b93d8b4ee9 [formerly 27c4557e0a]]
Former-commit-id: 001ab2a1e77f8172f671dc7b389622922fd91b17 [formerly 8cef173e1d]
Former-commit-id: 3e8caa6467
 2012-02-09 12:14:37 -06:00
Bryan Kowal
7ca62dc7d6 Issue #202 - make edex-cots specs compatible with the branch. 
Former-commit-id: 26243249e27ee347933748aa53e9436e32751d9c
 2012-02-09 12:14:37 -06:00
Bryan Kowal
94a4de607b Issue #202 - no longer build edex-ncep-nsharp for the ncep branch. 
Former-commit-id: d885bdcb6e [formerly b6a8534258] [formerly 998337f9f4] [formerly d885bdcb6e [formerly b6a8534258] [formerly 998337f9f4] [formerly 2554090d0d [formerly 998337f9f4 [formerly bd0cd789a4c6952aa61b9cef9e61e3f46c7ab462]]]]
Former-commit-id: 2554090d0d
Former-commit-id: 53dd09e1d1 [formerly b271da085c] [formerly 1b8e03644eb20289239e3c4e2bb6735b83eea7d8 [formerly 2745f9cac7]]
Former-commit-id: c0b4b2c1bd00ea92bfd9ddb6fc5fa78d54ecb052 [formerly bafb26c8be]
Former-commit-id: 1c9ee91f6c
 2012-01-30 16:01:45 -06:00
Bryan Kowal
998337f9f4 Issue #202 - no longer build edex-ncep-nsharp for the ncep branch. 
Former-commit-id: bd0cd789a4c6952aa61b9cef9e61e3f46c7ab462
 2012-01-30 16:01:45 -06:00
Bryan Kowal
a89f0a64f0 Issue #202 - restoring rpm directory to ss_sync. 
Former-commit-id: d537df4ab0 [formerly 4453ad2d10] [formerly 65e1e4ee0b] [formerly d537df4ab0 [formerly 4453ad2d10] [formerly 65e1e4ee0b] [formerly ea1c82452b [formerly 65e1e4ee0b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]]]]
Former-commit-id: ea1c82452b
Former-commit-id: 69f4822ad1 [formerly 9f6780c4dd] [formerly e63dac039e52161602915d3cf34685762acd5d9e [formerly 7f1b468010]]
Former-commit-id: ed7bf459df1503ce7bd9500dc984c56a535b768f [formerly dafb6b18d8]
Former-commit-id: bb662ca175
 2012-01-20 13:38:00 -06:00
Bryan Kowal
65e1e4ee0b Issue #202 - restoring rpm directory to ss_sync. 
Former-commit-id: 56068aa96fa6daf113861476bf4b7aebe2021ca4
 2012-01-20 13:38:00 -06:00
Matt Nash
515196cb86 Moving 12.1.1 into ss_sync 
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf] [formerly 21d2361f00 [formerly 1faae42484]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
 2012-01-19 11:53:12 -06:00
Matt Nash
66be3bec40 Moving 12.1.1 into ss_sync 
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
 2012-01-19 11:53:12 -06:00
Bryan Kowal
5c81820a8a Issue #34 - merging build changes originally made for the new svn transition into git. 
Former-commit-id: 48c7c3b950 [formerly 63f6f44fe1] [formerly 43c3807a32] [formerly 48c7c3b950 [formerly 63f6f44fe1] [formerly 43c3807a32] [formerly 9d64e1df12 [formerly 43c3807a32 [formerly 40f016a9f9e605b039d41ed44a59a269caf8a024]]]]
Former-commit-id: 9d64e1df12
Former-commit-id: f19cf1c4ee [formerly 281be5e0b7] [formerly 9ceb347a77 [formerly 06187b93be]]
Former-commit-id: 9ceb347a77
Former-commit-id: 5d92644c26
 2012-01-18 16:00:45 -06:00
Bryan Kowal
43c3807a32 Issue #34 - merging build changes originally made for the new svn transition into git. 
Former-commit-id: 40f016a9f9e605b039d41ed44a59a269caf8a024
 2012-01-18 16:00:45 -06:00
root
7dbd17a5aa Initial revision of AWIPS2 11.9.0-7p5 
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
 2012-01-06 08:55:05 -06:00
root
9f19e3f712 Initial revision of AWIPS2 11.9.0-7p5 
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
 2012-01-06 08:55:05 -06:00