xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/edexOsgi/com.raytheon.uf.edex.archive
History
Richard Peter 8b1a177110 Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml

Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900

Former-commit-id: 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]
Former-commit-id: 44b1782461
Former-commit-id: 67683dd891
2014-04-28 16:27:40 -05:00
..
.settings 13.5.1-1 baseline 2013-06-10 15:17:17 -04:00
META-INF Issue #2862 The DatabaseArchiver and ArhivePurger now have write cluster locks. 2014-04-09 13:57:55 -05:00
res/spring Merged 1354 -5 and -6 into 1412 based on 1411-25 2014-04-04 12:57:32 -04:00
resources Merged 1354 -5 and -6 into 1412 based on 1411-25 2014-04-04 12:57:32 -04:00
src/com/raytheon/uf/edex/archive Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1 2014-04-28 16:27:40 -05:00
utility/common_static/base Issue #3023 Configurable available disk thresholds and unit test fixes 2014-04-17 08:57:15 -05:00
.classpath Issue #2862 The DatabaseArchiver and ArhivePurger now have write cluster locks. 2014-04-09 13:57:55 -05:00
.project 13.5.1-1 baseline 2013-06-10 15:17:17 -04:00
build.properties Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins. 2014-01-06 17:03:45 -06:00
com.raytheon.uf.edex.archive.ecl 14.1.1-4 baseline 2013-10-28 10:55:16 -04:00