Steve Harris
86e586befe
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
54be9660f1
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 60f30af0c9e3203e2ff623d420165201dff41601
2012-02-22 11:14:43 -06:00
Steve Harris
9995d22e25
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: a04c1c31c89566279953d2a270df8d652a3a82ff
2012-02-22 10:12:49 -06:00
Steve Harris
5e9d2dd367
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
682c10767d
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
1855bbcbee
Issue #202 - make edex-cots specs compatible with the branch.
...
Former-commit-id: 26243249e27ee347933748aa53e9436e32751d9c
2012-02-09 12:14:37 -06:00
Bryan Kowal
2554090d0d
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
ea1c82452b
Issue #202 - restoring rpm directory to ss_sync.
...
Former-commit-id: 56068aa96fa6daf113861476bf4b7aebe2021ca4
2012-01-20 13:38:00 -06:00
Matt Nash
c83e5ff474
Moving 12.1.1 into ss_sync
...
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
2012-01-19 11:53:12 -06:00
Bryan Kowal
9d64e1df12
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
06a8b51d6d
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
2012-01-06 08:55:05 -06:00
