11 commits

Author	SHA1	Message	Date
Steve Harris	53d2822329	Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge ... Conflicts: ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java All of these were 'self-resolved' when kdiff3 invoked Former-commit-id: d7f7c26582 [formerly 092efd6072] [formerly 31b3e87ffa [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]] Former-commit-id: 31b3e87ffa Former-commit-id: 98447412f8	2012-05-09 13:19:47 -05:00
Steve Harris	33a67cdd82	12.4.1-10 baseline ... Former-commit-id: 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]] Former-commit-id: 8485b90ff8 Former-commit-id: a28d70b5c5	2012-05-01 18:06:13 -05:00
Steve Harris	51bb9ebb46	Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge ... Conflicts: edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java Former-commit-id: c90ce9d54e [formerly ed26e06df2] [formerly fee53dea94 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]] Former-commit-id: fee53dea94 Former-commit-id: dcdd7f0648	2012-04-10 12:50:03 -05:00
Steve Harris	8bc60b1e32	12.3.1-10 baseline ... Former-commit-id: 0e4128712b [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]] Former-commit-id: 22bd792cd9 Former-commit-id: ce3b74c605	2012-03-30 08:38:33 -05:00
David Gillingham	3c4e90e0bf	Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process. ... Former-commit-id: 7e5ec12276 [formerly e13850a2b6] [formerly d433b7d4d6 [formerly 727e2b19688397ea4608a2b6ca3fda3222b6ad36]] Former-commit-id: d433b7d4d6 Former-commit-id: 2b5588bd1e	2012-03-13 12:31:38 -05:00
Bryan Kowal	d04bc82c9a	Issue #202 - increment the awips2-qpid release so yum will update the qpid installation. ... Former-commit-id: 5838ff71f1 [formerly fc1ca4efcc] [formerly b871752e3a [formerly ff79422d30a93ca71fc83e38e0368e499a34dd59]] Former-commit-id: b871752e3a Former-commit-id: 638d2c964b	2012-03-08 09:00:55 -06:00
David Gillingham	5e2b3c3955	Issue #361: Use queueCreator.sh to build the new ISC data receive QPID ... queue. Former-commit-id: 15a9e7cdae [formerly 90a745a037] [formerly 78c7f29096 [formerly cc6bca06f0fdb5919fe9ea9dc46eafd3d2d41a08]] Former-commit-id: 78c7f29096 Former-commit-id: 8a86e910aa	2012-03-07 16:05:54 -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
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