Ron Anderson 46735c9afe Merge branch 'master_14.1.1' into solutions ... Conflicts: cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5 Former-commit-id: 2e8cbade9f [formerly 0bde38cef3] [formerly ba7a25a88f] [formerly 62c445d872 [formerly ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]] Former-commit-id: 62c445d872 Former-commit-id: 7dfb50efe6365a72db2ee0a724484df4f74fef25 [formerly 624375267e] Former-commit-id: dca7f21f7b		2014-01-13 17:45:20 -06:00
..
cache	13.5.1-1 baseline	2013-06-10 15:17:17 -04:00
db/hibernateConfig	Issue #1538 Reworked registry database connection strategy	2013-10-23 10:48:40 -05:00
res	13.5.1-1 baseline	2013-06-10 15:17:17 -04:00
spring	Merge branch 'development' into development_on_RHEL6	2013-11-12 11:11:36 -06:00
banner.txt	12.9.1-5 baseline	2012-08-21 15:27:03 -05:00
logback-dataprovideragent.xml	Issue #2142 initial cutover from log4j to SLF4J and logback	2013-07-01 14:41:05 -05:00
logback-ingest.xml	Merge branch 'omaha_13.5.3' (13.5.3-5) into development	2013-11-07 14:25:45 -06:00
logback-registry.xml	Issue #2494 Updated to use thread logger	2013-11-06 08:26:25 -06:00
logback.xml	Issue #2142 disable stacktraces on hibernate log to save disk space	2013-08-29 12:23:39 -05:00
logging.properties	Issue #2142 initial cutover from log4j to SLF4J and logback	2013-07-01 14:41:05 -05:00
modes.xml	Merge branch 'master_14.1.1' into solutions	2014-01-13 17:45:20 -06:00
wrapper.conf	Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf	2013-12-16 16:39:10 -06:00