awips2/edexOsgi/build.edex/esb/conf
Greg Armendariz e1180e770a Merge branch 'omaha_15.1.1' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/DbInit.java

Former-commit-id: e5919e105b [formerly f12b1a1098] [formerly e5919e105b [formerly f12b1a1098] [formerly 8773e17083 [formerly 111178b736cc4e894f59bc7127ec2bddda96264c]]]
Former-commit-id: 8773e17083
Former-commit-id: 49bd932339 [formerly a6133db8d2]
Former-commit-id: ec12c703fe
2014-07-21 12:12:32 -05:00
..
cache 13.5.1-1 baseline 2013-06-10 15:17:17 -04:00
db/hibernateConfig Omaha #3225 Reduce default hibernate connections 2014-06-23 17:20:46 -05:00
modes Omaha #3179 split modes.xml into plugin modes files 2014-05-28 13:32:18 -05:00
res Omaha #2914 - Remove calls to PropertiesFactory 2014-07-17 15:41:38 -05:00
security Omaha #3350 Added user/role authentication. Added XACML authorization 2014-07-16 10:49:24 -05:00
spring Omaha #1458: Remove reference to cron.properties 2014-05-08 12:58:49 -05:00
banner.txt 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
logback-dataprovideragent.xml Omaha #3379 Removing DWR 2014-07-11 11:56:44 -05:00
logback-ingest.xml Omaha #3379 Removing DWR 2014-07-11 11:56:44 -05:00
logback-registry.xml Omaha #3379 Removing DWR 2014-07-11 11:56:44 -05:00
logback.xml Omaha #3379 Removing DWR 2014-07-11 11:56:44 -05:00
logging.properties Issue #2142 initial cutover from log4j to SLF4J and logback 2013-07-01 14:41:05 -05:00
wrapper.conf Omaha #3225 Reduce default hibernate connections 2014-06-23 17:20:46 -05:00