Merge remote-tracking branch 'origin/master' into ldapper

Conflicts:
	app.py
This commit is contained in:
Jake Moshenko 2014-05-13 16:55:02 -04:00
commit 11c6c5fa52
10 changed files with 75 additions and 23 deletions

View file

@ -80,7 +80,7 @@ class DefaultConfig(object):
AUTHENTICATION_TYPE = 'Database'
# Build logs
BUILDLOGS = BuildLogs('logs.quay.io') # Change me
BUILDLOGS_OPTIONS = ['logs.quay.io']
# Real-time user events
USER_EVENTS = UserEventBuilder('logs.quay.io')