9 commits

Author	SHA1	Message	Date
Max Schenkelberg	544ffdc4ca	Issue #763 Removed references to OBE cots org.apahce.tomcat.nativ to reduce size of collaboration standalone product. This project could now be removed from the baseline ... Change-Id: I9d8d0155afa5c01f3cc027a5f5adb0e2a9893e47 Former-commit-id: e1d23a56a9 [formerly 62bd4a667a] [formerly a3014f6ec3 [formerly 24423c6b03bffd01313a93b6c641b3d8fef35902]] Former-commit-id: a3014f6ec3 Former-commit-id: 9328717a1a	2012-06-28 15:29:05 -05:00
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	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
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
David Gillingham	234801c998	Issue #20: Fix breakage to alertViz caused by changes to ... FileUtil.join(). Former-commit-id: 6a2b7e12d6 [formerly c6803ba434] [formerly 8a45f1f4c3 [formerly 8832c64ba47f87027d5215caf7d84b9fc6a187cd]] Former-commit-id: 8a45f1f4c3 Former-commit-id: 953f8a6535	2012-03-01 11:19:22 -06:00
David Gillingham	3e42bc7d2d	Issue #20: Committing refactored archiver capability ... Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf Issue #20: Address peer review comments from previous commit. Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf Former-commit-id: 535821e5b8 [formerly bb1ac9959b] [formerly 061966f243 [formerly 47750dfd5e387238f409ead55549cbb24f5afbe1]] Former-commit-id: 061966f243 Former-commit-id: 9f416558fa	2012-02-13 16:09:36 -06:00
Ben Steffensmeier	ebb6070fde	Issue #23 fix the LRUCacheFS so it does not create a cache directory if ... it is not using it, it creates different cache directories for different users and it has better error checking. Change-Id: I486a98583a0d952fe7753d28ae6a2026e943bfb4 Former-commit-id: 867fecfc6a [formerly 112679d14a] [formerly 2d0ba75b3e [formerly a29e7c8028c4d3099627da4a5586b7c6d13b51fb]] Former-commit-id: 2d0ba75b3e Former-commit-id: e06cfaca02	2012-01-26 15:13:40 -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