21 commits

Author	SHA1	Message	Date
Bryan Kowal	212afcceea	Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development ... Former-commit-id: 99d22f395a [formerly 99d22f395a [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]] Former-commit-id: f92eb59a73 Former-commit-id: 580172b47c	2012-07-10 16:57:16 -05:00
Bryan Kowal	611925412d	Merge branch 'ss_sync' (OB12.6.1-10) into development ... Conflicts: cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java cave/com.raytheon.viz.feature.awips.developer/feature.xml cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java edexOsgi/build.edex/deploy-install.xml edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF edexOsgi/com.raytheon.edex.feature.uframe/feature.xml edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java edexOsgi/com.raytheon.uf.common.hlstopo/build.properties edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java rpms/awips2-rpm.db rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template Former-commit-id: a33740e915 [formerly a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]] Former-commit-id: b87b66abc5 Former-commit-id: 9a7d0492fe	2012-06-27 17:21:48 -05:00
Bryan Kowal	657290655b	Issue #708 - update the binlightning edex specs. ... Former-commit-id: bd20a47c90 [formerly bd20a47c90 [formerly 0c37ab92aefae0b00a8c8767421c9b28773ca8fe]] Former-commit-id: f2a3f33e07 Former-commit-id: 59d98d5c11	2012-06-20 16:00:40 -05:00
Bryan Kowal	720c2063f0	Issue #708 - it is now possible to build edex rpms in the new baseline repository. ... Former-commit-id: 973ceff9a7 [formerly 973ceff9a7 [formerly 0932e1173258d916a6a1caae5c943903d830c2af]] Former-commit-id: f79134499e Former-commit-id: 1acbc16759	2012-06-20 11:22:58 -05:00
Steve Harris	ad91dc8a2e	12.5.1-15 baseline ... Former-commit-id: d5c238de07 [formerly d5c238de07 [formerly 1c128372ef9f478f1b807e8d0f23207d095bfc65]] Former-commit-id: cee20d8656 Former-commit-id: 7da9afe36a	2012-06-11 16:02:30 -05:00
Steve Harris	9054c5ab6c	12.5.1-15 baseline ... Former-commit-id: b13cbb7e00 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]] Former-commit-id: 3904c4ccf5 Former-commit-id: 676ea3192f	2012-06-08 13:39:48 -05:00
Steve Harris	2738af2019	12.5.1-6 baseline ... Former-commit-id: 24474489f9 [formerly 24474489f9 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]] Former-commit-id: fa87dc6cf1 Former-commit-id: c452cce633	2012-05-16 16:41:22 -05:00
Steve Harris	8cd5974f4c	12.4.1-4 baseline ... Former-commit-id: 67a5a68300 [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]] Former-commit-id: 2a216f333c Former-commit-id: a4e519f3cd	2012-04-18 15:18:16 -05:00
Bryan Kowal	8350501de4	Issue #202 - remove obsolete edex prefix verifications. ... Former-commit-id: 1e3e31a657 [formerly 1e3e31a657 [formerly 6984db8c852a552867b1b8159637d96dcd83ab5a]] Former-commit-id: c2cd292c32 Former-commit-id: 49a30a5b1a	2012-02-23 16:46:48 -06:00
Bryan Kowal	4a78479648	Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp. ... Former-commit-id: bae0cb555e [formerly bae0cb555e [formerly 10339dcba7c9ae535766e5c5dddac57ddb3f99c4]] Former-commit-id: e135f4508d Former-commit-id: 5c86773a77	2012-02-23 14:20:50 -06:00
Steve Harris	2c958713b6	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: dcadf7baa4 [formerly dcadf7baa4 [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]] Former-commit-id: 86e586befe Former-commit-id: 938dc5b21c	2012-02-23 12:38:55 -06:00
Steve Harris	15c56d11bc	Merging SS OB12.2.1 into ss_sync ... Former-commit-id: c8aae98741 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]] Former-commit-id: 54be9660f1 Former-commit-id: 4450cf8963	2012-02-22 11:14:43 -06:00
Steve Harris	156ad8471d	Merge branch 14-NCEP into 'ss_sync' ... Former-commit-id: 94c2ea985b [formerly 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]] Former-commit-id: 9995d22e25 Former-commit-id: aaead73ec5	2012-02-22 10:12:49 -06:00
Steve Harris	acd7845ebd	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: cabf9fd956 [formerly cabf9fd956 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]] Former-commit-id: 5e9d2dd367 Former-commit-id: 33483f3960	2012-02-20 13:03:39 -06:00
Bryan Kowal	8403801a2b	Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync. ... Former-commit-id: 10a0ca252d [formerly 10a0ca252d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]] Former-commit-id: 682c10767d Former-commit-id: 2ba23624b4	2012-02-17 12:17:14 -06:00
Bryan Kowal	8cef173e1d	Issue #202 - make edex-cots specs compatible with the branch. ... Former-commit-id: 7ca62dc7d6 [formerly 7ca62dc7d6 [formerly 26243249e27ee347933748aa53e9436e32751d9c]] Former-commit-id: 1855bbcbee Former-commit-id: 27c4557e0a	2012-02-09 12:14:37 -06:00
Bryan Kowal	bafb26c8be	Issue #202 - no longer build edex-ncep-nsharp for the ncep branch. ... Former-commit-id: 998337f9f4 [formerly 998337f9f4 [formerly bd0cd789a4c6952aa61b9cef9e61e3f46c7ab462]] Former-commit-id: 2554090d0d Former-commit-id: 2745f9cac7	2012-01-30 16:01:45 -06:00
Bryan Kowal	dafb6b18d8	Issue #202 - restoring rpm directory to ss_sync. ... Former-commit-id: 65e1e4ee0b [formerly 65e1e4ee0b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]] Former-commit-id: ea1c82452b Former-commit-id: 7f1b468010	2012-01-20 13:38:00 -06:00
Matt Nash	21d2361f00	Moving 12.1.1 into ss_sync ... Former-commit-id: 66be3bec40 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]] Former-commit-id: c83e5ff474 Former-commit-id: 1faae42484	2012-01-19 11:53:12 -06:00
Bryan Kowal	9ceb347a77	Issue #34 - merging build changes originally made for the new svn transition into git. ... Former-commit-id: 43c3807a32 [formerly 43c3807a32 [formerly 40f016a9f9e605b039d41ed44a59a269caf8a024]] Former-commit-id: 9d64e1df12 Former-commit-id: 06187b93be	2012-01-18 16:00:45 -06:00
root	377dcd10b9	Initial revision of AWIPS2 11.9.0-7p5 ... Former-commit-id: 9f19e3f712 [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]] Former-commit-id: 06a8b51d6d Former-commit-id: 3360eb6c5f	2012-01-06 08:55:05 -06:00