Commit graph

116 commits

Author SHA1 Message Date
Bryan Kowal
5754f9dfd8 Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: 682c10767d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]
Former-commit-id: 10a0ca252d
2012-02-17 12:17:14 -06:00
Steve Harris
68a5ebc0ad Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: c1129dbd00 [formerly 14c8ac5618aa04da5408a1d75297f3f9fa19d023]
Former-commit-id: 272ba87883
2012-02-15 15:08:58 -06:00
Steve Harris
221a02882a Merge commit 'awips2_OB12.1.1_Omaha' into 4-Thin_Client
Conflicts:
	msi/AWIPSII.CAVE/AWIPSII.CAVE/ipr.gif
	msi/AWIPSII.CAVE/AWIPSII.CAVE/obj/x86/Release/_DELETE_ME_
	nativeLib/rary.cots.jepp/jepp-2.3/windows/Release/_DELETE_ME_

Chose to keep in 4-Thin_Client


Former-commit-id: 23cc9689de [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]
Former-commit-id: b9f4780fcb
2012-02-15 14:39:43 -06:00
Steve Harris
6aed9311a8 Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
Former-commit-id: 1707b98721 [formerly f3bac368dacad47036f9823243379fe6ed1d4869]
Former-commit-id: 7356d655da
2012-02-15 14:34:47 -06:00
Steve Harris
74c156e508 Added the patch/bin directory and company to the installer.ldm for rpm builds
Former-commit-id: a91b01bfbe [formerly ab787c94408e85afe2d92c3f860b7b9bd271c616]
Former-commit-id: 5e47f8c33a
2012-02-15 12:54:54 -06:00
Steve Harris
46dda7b8bd Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 2e29bc8ee2 [formerly f70d42ad051ba56da8d8f28213b07c292e7f2549]
Former-commit-id: 2119a1513e
2012-02-14 15:54:46 -06:00
Ben Steffensmeier
808846e237 Issue #176 remove id from dataURI notifications
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58

Issue #342 - edex_com, edex_notify, and awips2-notification updates.
Change-Id: Iba95d0fac10f40c76db4a46924f93cbbe40da4a2

Former-commit-id: f65d86a06a [formerly 518db101f2ec18afa31a5b12fbaab3bbb903013b]
Former-commit-id: 944e59e989
2012-02-14 15:46:11 -06:00
Bryan Kowal
a19dd6ff33 Issue #202 - make edex-cots specs compatible with the branch.
Former-commit-id: 1855bbcbee [formerly 26243249e27ee347933748aa53e9436e32751d9c]
Former-commit-id: 7ca62dc7d6
2012-02-09 12:14:37 -06:00
Bryan Kowal
00c0ab406b Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups.
Former-commit-id: 7d21e3149e [formerly 3038b2fc0d69236267db13eeb88e6f803cc6215a]
Former-commit-id: 40c0e93995
2012-01-30 16:05:17 -06:00
Bryan Kowal
b6a8534258 Issue #202 - no longer build edex-ncep-nsharp for the ncep branch.
Former-commit-id: 2554090d0d [formerly bd0cd789a4c6952aa61b9cef9e61e3f46c7ab462]
Former-commit-id: 998337f9f4
2012-01-30 16:01:45 -06:00
Jonathan Sanchez
869de9a03b Issue #19 Committed changes to Wes2Bridge branch.
Former-commit-id: 4bce8e5ece [formerly c0a860f692ba514f9ea7566fb0e3c00de05d8c92]
Former-commit-id: 12a5931e75
2012-01-24 10:20:28 -06:00
Bryan Kowal
a37509adf3 Issue #18 - merging wes2bridge rpm changes into the git wes2bridge branch.
Former-commit-id: bda5954b3c [formerly 9df496bfe5fea08e8c2c11e5fadcc0d09bad125d]
Former-commit-id: c08293a1dc
2012-01-23 14:39:39 -06:00
Bryan Kowal
4453ad2d10 Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: ea1c82452b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]
Former-commit-id: 65e1e4ee0b
2012-01-20 13:38:00 -06:00
Matt Nash
580e2938d7 Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: 66be3bec40
2012-01-19 11:53:12 -06:00
Bryan Kowal
63f6f44fe1 Issue #34 - merging build changes originally made for the new svn transition into git.
Former-commit-id: 9d64e1df12 [formerly 40f016a9f9e605b039d41ed44a59a269caf8a024]
Former-commit-id: 43c3807a32
2012-01-18 16:00:45 -06:00
root
a02aeb236c Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 9f19e3f712
2012-01-06 08:55:05 -06:00