524 commits

Author	SHA1	Message	Date
Bryan Kowal	fa23b673c4	Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp. ... Former-commit-id: 4881def0e9 [formerly bae0cb555e] [formerly e135f4508d [formerly 10339dcba7c9ae535766e5c5dddac57ddb3f99c4]] Former-commit-id: e135f4508d Former-commit-id: 5c86773a77	2012-02-23 14:20:50 -06:00
Steve Harris	4eb1ef5b0f	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: 4981170462 [formerly dcadf7baa4] [formerly 86e586befe [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]] Former-commit-id: 86e586befe Former-commit-id: 938dc5b21c	2012-02-23 12:38:55 -06:00
Steve Harris	92b7072b82	Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client ... Conflicts: ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java deleted 'H5U; PlotResource2.java was not edited Former-commit-id: 92084b3f20 [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]] Former-commit-id: 7a10ca9766 Former-commit-id: 3d511fe719	2012-02-23 10:06:18 -06:00
Steve Harris	b55a488ed8	Merging SS OB12.2.1 into ss_sync ... Former-commit-id: 8da36046de [formerly c8aae98741] [formerly 54be9660f1 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]] Former-commit-id: 54be9660f1 Former-commit-id: 4450cf8963	2012-02-22 11:14:43 -06:00
Steve Harris	610fdf3f4e	Merge branch 14-NCEP into 'ss_sync' ... Former-commit-id: 85075e6107 [formerly 94c2ea985b] [formerly 9995d22e25 [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]] Former-commit-id: 9995d22e25 Former-commit-id: aaead73ec5	2012-02-22 10:12:49 -06:00
Steve Harris	dd3a5a8d88	Merge branch 'ss_sync' (OB12.1.2) into 9-Wes2Bridge ... Conflicts: .gitignore cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java deltaScripts/.pydevproject edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/ServerSpecificPersistablePluginDataObject.java edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IDataArchiver.java edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java Former-commit-id: ec0f1aebfc [formerly b89ebc5e01] [formerly 496cc6a06b [formerly 85082f273a85a3967d54d4a489b6ea973d0688be]] Former-commit-id: 496cc6a06b Former-commit-id: 4a93298877	2012-02-20 16:38:06 -06:00
Steve Harris	b12f5e5d75	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: d971880b98 [formerly cabf9fd956] [formerly 5e9d2dd367 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]] Former-commit-id: 5e9d2dd367 Former-commit-id: 33483f3960	2012-02-20 13:03:39 -06:00
Steve Harris	dd911bed4d	Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client ... Former-commit-id: c268da57bc [formerly 4b76d22f77] [formerly cc66c8be24 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]] Former-commit-id: cc66c8be24 Former-commit-id: 54b5b6baef	2012-02-20 12:43:38 -06:00
Bryan Kowal	cc8c6597a2	Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync. ... Former-commit-id: 5754f9dfd8 [formerly 10a0ca252d] [formerly 682c10767d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]] Former-commit-id: 682c10767d Former-commit-id: 2ba23624b4	2012-02-17 12:17:14 -06:00
Steve Harris	4e6af98f5b	Merge branch '10-Tech_Blocked' into 104-integration ... Former-commit-id: 68a5ebc0ad [formerly 272ba87883] [formerly c1129dbd00 [formerly 14c8ac5618aa04da5408a1d75297f3f9fa19d023]] Former-commit-id: c1129dbd00 Former-commit-id: ad402655f4	2012-02-15 15:08:58 -06:00
Steve Harris	a85a777232	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: 221a02882a [formerly b9f4780fcb] [formerly 23cc9689de [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]] Former-commit-id: 23cc9689de Former-commit-id: a2e3aabc60	2012-02-15 14:39:43 -06:00
Steve Harris	de85613a99	Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP ... Former-commit-id: 6aed9311a8 [formerly 7356d655da] [formerly 1707b98721 [formerly f3bac368dacad47036f9823243379fe6ed1d4869]] Former-commit-id: 1707b98721 Former-commit-id: db1e3b1215	2012-02-15 14:34:47 -06:00
Steve Harris	98b223d08e	Added the patch/bin directory and company to the installer.ldm for rpm builds ... Former-commit-id: 74c156e508 [formerly 5e47f8c33a] [formerly a91b01bfbe [formerly ab787c94408e85afe2d92c3f860b7b9bd271c616]] Former-commit-id: a91b01bfbe Former-commit-id: 39b13d7102	2012-02-15 12:54:54 -06:00
Steve Harris	d23d12d596	Merge branch '4-Thin_Client' into 104-integration ... Former-commit-id: 46dda7b8bd [formerly 2119a1513e] [formerly 2e29bc8ee2 [formerly f70d42ad051ba56da8d8f28213b07c292e7f2549]] Former-commit-id: 2e29bc8ee2 Former-commit-id: cb3371ee28	2012-02-14 15:54:46 -06:00
Ben Steffensmeier	993f2aafa4	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: 808846e237 [formerly 944e59e989] [formerly f65d86a06a [formerly 518db101f2ec18afa31a5b12fbaab3bbb903013b]] Former-commit-id: f65d86a06a Former-commit-id: d00572c122	2012-02-14 15:46:11 -06:00
Bryan Kowal	88b67b4977	Issue #202 - make edex-cots specs compatible with the branch. ... Former-commit-id: a19dd6ff33 [formerly 7ca62dc7d6] [formerly 1855bbcbee [formerly 26243249e27ee347933748aa53e9436e32751d9c]] Former-commit-id: 1855bbcbee Former-commit-id: 27c4557e0a	2012-02-09 12:14:37 -06:00
Bryan Kowal	e17a1e06a7	Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups. ... Former-commit-id: 00c0ab406b [formerly 40c0e93995] [formerly 7d21e3149e [formerly 3038b2fc0d69236267db13eeb88e6f803cc6215a]] Former-commit-id: 7d21e3149e Former-commit-id: e9d85fc09c	2012-01-30 16:05:17 -06:00
Bryan Kowal	b271da085c	Issue #202 - no longer build edex-ncep-nsharp for the ncep branch. ... Former-commit-id: b6a8534258 [formerly 998337f9f4] [formerly 2554090d0d [formerly bd0cd789a4c6952aa61b9cef9e61e3f46c7ab462]] Former-commit-id: 2554090d0d Former-commit-id: 2745f9cac7	2012-01-30 16:01:45 -06:00
Jonathan Sanchez	094c4173ae	Issue #19 Committed changes to Wes2Bridge branch. ... Former-commit-id: 869de9a03b [formerly 12a5931e75] [formerly 4bce8e5ece [formerly c0a860f692ba514f9ea7566fb0e3c00de05d8c92]] Former-commit-id: 4bce8e5ece Former-commit-id: 67dd0f65d6	2012-01-24 10:20:28 -06:00
Bryan Kowal	886b054204	Issue #18 - merging wes2bridge rpm changes into the git wes2bridge branch. ... Former-commit-id: a37509adf3 [formerly c08293a1dc] [formerly bda5954b3c [formerly 9df496bfe5fea08e8c2c11e5fadcc0d09bad125d]] Former-commit-id: bda5954b3c Former-commit-id: 6a07f850bd	2012-01-23 14:39:39 -06:00
Bryan Kowal	9f6780c4dd	Issue #202 - restoring rpm directory to ss_sync. ... Former-commit-id: 4453ad2d10 [formerly 65e1e4ee0b] [formerly ea1c82452b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]] Former-commit-id: ea1c82452b Former-commit-id: 7f1b468010	2012-01-20 13:38:00 -06:00
Matt Nash	82300ccdcf	Moving 12.1.1 into ss_sync ... Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]] Former-commit-id: c83e5ff474 Former-commit-id: 1faae42484	2012-01-19 11:53:12 -06:00
Bryan Kowal	281be5e0b7	Issue #34 - merging build changes originally made for the new svn transition into git. ... Former-commit-id: 63f6f44fe1 [formerly 43c3807a32] [formerly 9d64e1df12 [formerly 40f016a9f9e605b039d41ed44a59a269caf8a024]] Former-commit-id: 9d64e1df12 Former-commit-id: 06187b93be	2012-01-18 16:00:45 -06:00
root	8e80217e59	Initial revision of AWIPS2 11.9.0-7p5 ... Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]] Former-commit-id: 06a8b51d6d Former-commit-id: 3360eb6c5f	2012-01-06 08:55:05 -06:00