6 commits

Author	SHA1	Message	Date
Steve Harris	31b3e87ffa	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: f98354aae305ad227eaf3b36e4393b8aefc80f02	2012-05-09 13:19:47 -05:00
Steve Harris	2a216f333c	12.4.1-4 baseline ... Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7	2012-04-18 15:18:16 -05:00
Bryan Kowal	839d7c886f	Issue #18 - rename jetty.port to web.port; the default for web.port is now 8080. The wes2bridge utilities are now built from source. ... Former-commit-id: f11953c494fac20b2ad53b41069cfcb24281eb4a	2012-04-09 09:32:45 -05:00
Bryan Kowal	2ed20e107d	Issue #18 - fix port conflicts that prevented multiple instances of edex request from starting; fix a problem that prevented the selected http port in setup.env from propogating throughout the edex instances. ... Former-commit-id: 6b206773eff05abf20ecc87b27e96c47b67ba600	2012-04-04 18:29:13 -05:00
Matt Nash	c83e5ff474	Moving 12.1.1 into ss_sync ... Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11	2012-01-19 11:53:12 -06:00
root	06a8b51d6d	Initial revision of AWIPS2 11.9.0-7p5 ... Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f	2012-01-06 08:55:05 -06:00