Steve Harris fb3a30b3b3 Merge branch 'omaha_14.2.1' into development ... Conflicts: cave/com.raytheon.uf.viz.application/src/com/raytheon/uf/viz/application/VizApplication.java Former-commit-id: f562540e7c [formerly 14ba3b29f4] [formerly 1738185503] [formerly f562540e7c [formerly 14ba3b29f4] [formerly 1738185503] [formerly 1aea63a1f6 [formerly 1738185503 [formerly d1fb8bcf1780b94bf23ce60dc4a6e0a10b37fe45]]]] Former-commit-id: 1aea63a1f6 Former-commit-id: cdb99cc3e0 [formerly d9cd003a5a] [formerly 5d9047e5063900e85cef179c5be76057b8ca6cd1 [formerly 1fd5b2255f]] Former-commit-id: 50ad78f33f6b09f52d5450f88139cd7ee524d3fd [formerly ec69a2c4f7] Former-commit-id: e3d1abe909		2014-01-29 09:41:57 -06:00
..
cache	13.5.1-1 baseline	2013-06-10 15:17:17 -04:00
db/hibernateConfig	Issue #2125: Clean up hibernate warnings	2014-01-17 14:12:34 -06:00
res	13.5.1-1 baseline	2013-06-10 15:17:17 -04:00
spring	Issue #2608 quartz components use single scheduler	2014-01-14 08:43:21 -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	Issue #2359 updated readme with bscalio suggestions	2014-01-23 09:25:37 -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 #2627 configurable ability to retain failed data, log 'expected'	2014-01-22 09:27:46 -06:00