Bryan Kowal
48d5fd8ee6
Issue #202 - remove obsolete edex prefix verifications.
...
Former-commit-id: c2cd292c32
[formerly 1e3e31a657
[formerly 6984db8c852a552867b1b8159637d96dcd83ab5a]]
Former-commit-id: 1e3e31a657
Former-commit-id: 475849bd91
2012-02-23 16:46:48 -06:00
Bryan Kowal
e723d50244
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: e135f4508d
[formerly bae0cb555e
[formerly 10339dcba7c9ae535766e5c5dddac57ddb3f99c4]]
Former-commit-id: bae0cb555e
Former-commit-id: 4881def0e9
2012-02-23 14:20:50 -06:00
Steve Harris
0be3703c7e
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: 86e586befe
[formerly dcadf7baa4
[formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]
Former-commit-id: dcadf7baa4
Former-commit-id: 4981170462
2012-02-23 12:38:55 -06:00
Steve Harris
829d2791e9
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 54be9660f1
[formerly c8aae98741
[formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: c8aae98741
Former-commit-id: 8da36046de
2012-02-22 11:14:43 -06:00
Steve Harris
a811ac888f
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: 9995d22e25
[formerly 94c2ea985b
[formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]
Former-commit-id: 94c2ea985b
Former-commit-id: 85075e6107
2012-02-22 10:12:49 -06:00
Steve Harris
eda787edea
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: 5e9d2dd367
[formerly cabf9fd956
[formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]
Former-commit-id: cabf9fd956
Former-commit-id: d971880b98
2012-02-20 13:03:39 -06:00
Bryan Kowal
eda0f92b17
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
...
Former-commit-id: 682c10767d
[formerly 10a0ca252d
[formerly be16819b50761daa75717bc901f73c66a7ad1af5]]
Former-commit-id: 10a0ca252d
Former-commit-id: 5754f9dfd8
2012-02-17 12:17:14 -06:00
Bryan Kowal
30ef4b72b8
Issue #202 - make edex-cots specs compatible with the branch.
...
Former-commit-id: 1855bbcbee
[formerly 7ca62dc7d6
[formerly 26243249e27ee347933748aa53e9436e32751d9c]]
Former-commit-id: 7ca62dc7d6
Former-commit-id: a19dd6ff33
2012-02-09 12:14:37 -06:00
Bryan Kowal
d885bdcb6e
Issue #202 - no longer build edex-ncep-nsharp for the ncep branch.
...
Former-commit-id: 2554090d0d
[formerly 998337f9f4
[formerly bd0cd789a4c6952aa61b9cef9e61e3f46c7ab462]]
Former-commit-id: 998337f9f4
Former-commit-id: b6a8534258
2012-01-30 16:01:45 -06:00
Bryan Kowal
d537df4ab0
Issue #202 - restoring rpm directory to ss_sync.
...
Former-commit-id: ea1c82452b
[formerly 65e1e4ee0b
[formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]]
Former-commit-id: 65e1e4ee0b
Former-commit-id: 4453ad2d10
2012-01-20 13:38:00 -06:00
Matt Nash
d8da2252c3
Moving 12.1.1 into ss_sync
...
Former-commit-id: c83e5ff474
[formerly 66be3bec40
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: 66be3bec40
Former-commit-id: 580e2938d7
2012-01-19 11:53:12 -06:00
Bryan Kowal
48c7c3b950
Issue #34 - merging build changes originally made for the new svn transition into git.
...
Former-commit-id: 9d64e1df12
[formerly 43c3807a32
[formerly 40f016a9f9e605b039d41ed44a59a269caf8a024]]
Former-commit-id: 43c3807a32
Former-commit-id: 63f6f44fe1
2012-01-18 16:00:45 -06:00
root
133dc97f67
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 06a8b51d6d
[formerly 9f19e3f712
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 9f19e3f712
Former-commit-id: a02aeb236c
2012-01-06 08:55:05 -06:00