9 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	a2a6a18fae	12.4.1-4 baseline ... Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]] Former-commit-id: 2a216f333c Former-commit-id: a4e519f3cd	2012-04-18 15:18:16 -05:00
Nate Jensen	a65f8d8242	Integrating Richard's changes with 12.2.1 ... Change-Id: I1831502d72bed7b804287bb7c3e4ea501514ada4 Former-commit-id: 94ae63b740 [formerly d18a15535a] [formerly afe3c5db9c [formerly 729a478cf151a4d61bb31adba4193c3fc33717a1]] Former-commit-id: afe3c5db9c Former-commit-id: 74b6e7b389	2012-02-28 09:37:45 -06:00
Nate Jensen	802607c79f	Issue #181 fixing edex feature and component deploys ... Change-Id: Id7bad29c6914b13b3a6f47452f772999b696f48d Former-commit-id: fae8fd5a6d [formerly 8e3730adbf] [formerly 1dabb12dce [formerly 0c82def5c753aab240848aac8dc906a161461ac3]] Former-commit-id: 1dabb12dce Former-commit-id: 9c4ad58867	2012-01-24 12:15:01 -06:00
Nate Jensen	7301ad5c66	Issue #181 integrating ncep edex code ... Change-Id: Iaf11559e4cdb4f846d02283c5d2038474c0118e3 Former-commit-id: 6366bc35cb [formerly fe52a35f7a] [formerly 33756de9c8 [formerly 3aa13bd49e23ef963127f7efbc91054c06808f1c]] Former-commit-id: 33756de9c8 Former-commit-id: 3b7a082f41	2012-01-24 09:59:50 -06:00
Bryan Kowal	a1dbdff475	Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml. ... Former-commit-id: 971bf802ac [formerly 2142afe3f1] [formerly 2b5ee4b940 [formerly 296d2915b17f0086d93e200d4780663bff34edbb]] Former-commit-id: 2b5ee4b940 Former-commit-id: 2a7b92ec91	2012-01-20 11:37:38 -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