Steve Harris edeb1833ae Merge branch 'omaha_14.2.1' into development ... Conflicts: edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml Former-commit-id: 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]] Former-commit-id: f60aba35d6 Former-commit-id: dd4a41540248d59f726530a16fc9cba204845e67 [formerly 708485427e] Former-commit-id: c24108e75b		2014-03-07 15:43:40 -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	Merge branch 'omaha_14.2.1' into development	2014-03-07 15:43:40 -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 'master_14.1.1' (-21) into 'master_14.2.1' (-8)	2014-03-06 08:39:43 -06:00
logback-registry.xml	Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)	2014-03-06 08:39:43 -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' (-21) into 'master_14.2.1' (-8)	2014-03-06 08:39:43 -06:00
wrapper.conf	Issue #2627 shorten wrapper arg for retaining failed data	2014-03-05 09:04:10 -06:00