Felipe Monteiro bc36541f52 Merge branch 'master' into oslo-log-integration		2017-07-06 18:48:42 -04:00
..
config-generator.conf	Oslo config integration (#1)	2017-06-26 16:57:50 -07:00
deckhand.conf.sample	DECKHAND-10: Add Barbican integration to Deckhand	2017-06-29 22:25:11 +01:00
logging.conf	Add oslo.log integration	2017-07-06 23:45:09 +01:00
logging.conf.sample	Add oslo.log integration	2017-07-06 23:45:09 +01:00